Skip to contentSkip to conversation

poky.conf: Define SDK_VERSION so DISTRO_VERSION overrides are supported

PATCH In review Peter Kjellerstedt 4 participants 5 messages Jan 18, 2019 – Jan 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta-poky/conf/distro/poky.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-poky/conf/distro/poky.conf +1 -1
index f5de8f2335..73d200ebbd 100644
@@ -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 <[email protected]>"
 
Signature · 1 line
2.12.0
#1 lore raw

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?

Quoted 36 lines · Peter Kjellerstedt

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.

---
 meta-poky/conf/distro/poky.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-poky/conf/distro/poky.conf +0 -1
index f5de8f2335..73d200ebbd 100644
@@ -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 <[email protected]>"

--
2.12.0

--
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Signature · 4 lines
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
#2 lore raw

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 <[email protected]>
Sent: den 18 januari 2019 17:41
To: Peter Kjellerstedt <[email protected]>
Cc: [email protected]
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 <[email protected]<mailto:[email protected]>> 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.

---
 meta-poky/conf/distro/poky.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-poky/conf/distro/poky.conf +1 -1
index f5de8f2335..73d200ebbd 100644
@@ -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:$%[email protected]('DISTRO_VERSION').replace('snapshot-$%7bDATE%7d',%20'snapshot')%7d>"
 
 MAINTAINER = "Poky <[email protected]<mailto:[email protected]>>"
 

--
2.12.0

--
_______________________________________________
poky mailing list [email protected]<mailto:[email protected]>
https://lists.yoctoproject.org/listinfo/poky

--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics

#3 lore raw

oops... are we cool on the docs?

Scott

Quoted 80 lines · 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 <[email protected]> *Sent:* den 18 januari 2019 17:41
*To:* Peter Kjellerstedt <[email protected]> *Cc:* [email protected]
*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 < [email protected]> 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.

---
 meta-poky/conf/distro/poky.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-poky/conf/distro/poky.conf +0 -1
index f5de8f2335..73d200ebbd 100644
@@ -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 <[email protected]>"

--
2.12.0

--
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

--

Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
--
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

#4 lore raw
Quoted 11 lines · Scott Rifenbark

oops... are we cool on the docs?

Scott

Quoted 5 lines · 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. ;)

I tweaked the commit message and merged it so yes, we're good now.

Cheers,

Richard