Skip to contentSkip to conversation

base.bbclass: Fix dangling NATIVELSBSTRING

PATCH In review Robert Yang 2 participants 3 messages Jan 6, 2021 – Jan 7, 2021

lore
Share & tools
lore
#0 lore raw

cover base.bbclass: Fix dangling NATIVELSBSTRING

The following changes since commit 23cb39a5fa2a55681e7bc2605f435135cec9173b:

diffstat: point the license checksum at the license (2021-01-05 13:48:07 +0000)

are available in the Git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/lsb
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/lsb

Robert Yang (1):
base.bbclass: Fix dangling NATIVELSBSTRING

 meta/classes/base.bbclass | 2 ++
 1 file changed, 2 insertions(+)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 base.bbclass: Fix dangling NATIVELSBSTRING

Fixed:

$ rm -fr tmp; bitbake quilt-native -n
Build Configuration:
[snip]
NATIVELSBSTRING      = "ubuntu-18.04"
[snip]

And when run bitbake again:

$ bitbake quilt-native -n
Build Configuration:
NATIVELSBSTRING      = "universal"

It has been changed from ubuntu-18.04 to universal on the same host and build directory, this is because it is overridded by NATIVELSBSTRING. This patch makes it print the correct value.

---
 meta/classes/base.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/base.bbclass +2 -0
index 78ae28bb0f4..aeb41efd24d 100644
@@ -208,6 +208,8 @@ BUILDCFG_FUNCS[type] = "list"
 def buildcfg_vars(d):
     statusvars = oe.data.typed_value('BUILDCFG_VARS', d)
     for var in statusvars:
+        if var == 'NATIVELSBSTRING':
+            var = 'ORIGNATIVELSBSTRING'
         value = d.getVar(var)
         if value is not None:
             yield '%-20s = "%s"' % (var, value)
Signature · 1 line
2.17.1
#2 lore raw
Quoted 31 lines · Robert Yang

Fixed:

$ rm -fr tmp; bitbake quilt-native -n
Build Configuration:
[snip]
NATIVELSBSTRING      = "ubuntu-18.04"
[snip]

And when run bitbake again:

$ bitbake quilt-native -n
Build Configuration:
NATIVELSBSTRING      = "universal"

It has been changed from ubuntu-18.04 to universal on the same host and build directory, this is because it is overridded by NATIVELSBSTRING. This patch makes it print the correct value.

---
 meta/classes/base.bbclass | 2 ++

 1 file changed, 2 insertions(+)
meta/classes/base.bbclass +0 -0
index 78ae28bb0f4..aeb41efd24d 100644
@@ -208,6 +208,8 @@ BUILDCFG_FUNCS[type] = "list"

 def buildcfg_vars(d):
     statusvars = oe.data.typed_value('BUILDCFG_VARS', d) for var in statusvars:

meta/classes/base.bbclass +2 -0
+        if var == 'NATIVELSBSTRING':
+            var = 'ORIGNATIVELSBSTRING'
Quoted 3 lines

         value = d.getVar(var)
         if value is not None:
             yield '%-20s = "%s"' % (var, value)

I agree the display should be consistent and we perhaps need to look again at how this code is working. I really don't like pretending one value is another though so this isn't the correct fix.

Cheers,

Richard