[poky] [PATCH] poky.conf: Define SDK_VERSION so DISTRO_VERSION overrides are supported

[Peter Kjellerstedt]

Not sure if it is needed as such, but in the lights of the recent problem with base-files, it seemed better to change it here as well. Also, since Scott and RP were a bit trigger happy, the manual has already been updated to state that the below is how SDK_VERSION is defined in poky.conf. ;)

//Peter

From: Christopher Larson <kergoth at gmail.com>
Sent: den 18 januari 2019 17:41
To: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
Cc: poky at yoctoproject.org
Subject: Re: [poky] [PATCH] poky.conf: Define SDK_VERSION so DISTRO_VERSION overrides are supported

The commit message covers the := -> =, but doesn’t mention the switch to getVar. I’m assuming it’s similar to the base-files fix when referencing an undefined variable, but is it really needed in this context?

On Fri, Jan 18, 2019 at 8:49 AM Peter Kjellerstedt <peter.kjellerstedt at axis.com<mailto:peter.kjellerstedt at axis.com>> wrote:
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.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com<mailto:peter.kjellerstedt at axis.com>>
---
 meta-poky/conf/distro/poky.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)"
 DISTRO_VERSION = "2.6+snapshot-${DATE}"
 DISTRO_CODENAME = "master"
 SDK_VENDOR = "-pokysdk"
-SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}<mailto:$%7b@'$%7bDISTRO_VERSION%7d'.replace('snapshot-$%7bDATE%7d','snapshot')%7d>"
+SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}<mailto:$%7b at d.getVar('DISTRO_VERSION').replace('snapshot-$%7bDATE%7d',%20'snapshot')%7d>"

 MAINTAINER = "Poky <poky at yoctoproject.org<mailto:poky at yoctoproject.org>>"

--
2.12.0

--
_______________________________________________
poky mailing list
poky at yoctoproject.org<mailto:poky at yoctoproject.org>
https://lists.yoctoproject.org/listinfo/poky


--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/poky/attachments/20190122/2a4eb108/attachment.html>