diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-01-18 16:49:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-22 14:35:58 +0000 |
commit | a91f5d096f4f7748b9acd5fdaa83b2fea91ebf93 (patch) | |
tree | f49cd4cf8f00bc328e1a2a932a11646436772ed9 /meta-poky | |
parent | d150f6f5e799923867fdc7d2e638be07406997e7 (diff) | |
download | poky-a91f5d096f4f7748b9acd5fdaa83b2fea91ebf93.tar.gz |
poky.conf: Define SDK_VERSION so DISTRO_VERSION overrides are supported
If DISTRO_VERSION is defined using an override, e.g., by defining it
in auto.conf as DISTRO_VERSION_forcevariable, then the unoverridden
value was still used in SDK_VERSION since it was defined using the :=
operator. However, there should be no reason to define SDK_VERSION
this way.
Also use getVar to access the variable to ensure tracebacks from problems
are less confusing.
[RP: Tweaked commit message]
(From meta-yocto rev: 74f43fb82a93eecfe7519a87fdf1cb0152d56b48)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky')
-rw-r--r-- | meta-poky/conf/distro/poky.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index f5de8f2335..73d200ebbd 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf | |||
@@ -3,7 +3,7 @@ DISTRO_NAME = "Poky (Yocto Project Reference Distro)" | |||
3 | DISTRO_VERSION = "2.6+snapshot-${DATE}" | 3 | DISTRO_VERSION = "2.6+snapshot-${DATE}" |
4 | DISTRO_CODENAME = "master" | 4 | DISTRO_CODENAME = "master" |
5 | SDK_VENDOR = "-pokysdk" | 5 | SDK_VENDOR = "-pokysdk" |
6 | SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" | 6 | SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" |
7 | 7 | ||
8 | MAINTAINER = "Poky <poky@yoctoproject.org>" | 8 | MAINTAINER = "Poky <poky@yoctoproject.org>" |
9 | 9 | ||