From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Fri, 18 Jan 2019 15:49:20 +0000 (+0100)
Subject: poky.conf: Define SDK_VERSION so DISTRO_VERSION overrides are supported
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a91f5d096f4f7748b9acd5fdaa83b2fea91ebf93;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index f5de8f2335d..73d200ebbde 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)"
 DISTRO_VERSION = "2.6+snapshot-${DATE}"
 DISTRO_CODENAME = "master"
 SDK_VENDOR = "-pokysdk"
-SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
+SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}"
 
 MAINTAINER = "Poky <poky@yoctoproject.org>"