Skip to contentSkip to conversation

Fixes for warnings during parse with multilib

PATCH Applied Paul Eggleton 3 participants 5 messages Sep 22, 2012 – Sep 24, 2012

lore
Share & tools
lore
#0 lore raw

v2 cover Fixes for warnings during parse with multilib

The following changes since commit 5e03d1e83d0536a2fc69a88d3e5407108836203f:

gcc: Use 4.7.2 release tarball (2012-09-21 14:55:26 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/multilib
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/multilib

Paul Eggleton (2):
classes/multilib: ensure MLPREFIX is set for image recipes classes/multilib: prevent multilib extension of nativesdk recipes

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

PATCH v2 2/2 classes/multilib: prevent multilib extension of nativesdk recipes

It isn't supported to mix multilib and nativesdk in the same target, so explicitly skip multilib processing if nativesdk is inherited. As a bonus this fixes a bunch of related "missing file" warnings from the file checksum code during parsing because BPN was not correctly stripped for these targets.

Second half of the fix for [YOCTO #3146].

---
 meta/classes/multilib.bbclass |    3 +++
 1 file changed, 3 insertions(+)
meta/classes/multilib.bbclass +3 -0
index 4d3f889..7d5fc41 100644
@@ -19,6 +19,9 @@ python multilib_virtclass_handler () {
     if bb.data.inherits_class('native', e.data):
         raise bb.parse.SkipPackage("We can't extend native recipes")
 
+    if bb.data.inherits_class('nativesdk', e.data):
+        raise bb.parse.SkipPackage("We can't extend nativesdk recipes")
+
     save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
     for name in save_var_name.split():
         val=e.data.getVar(name, True)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/2 classes/multilib: ensure MLPREFIX is set for image recipes

In reply to Paul Eggleton

We need MLPREFIX to be set so that oe.utils.prune_suffix() (as used for the value of BPN) can derive the bare name from the multilib-extended name for image recipes. BPN being set correctly avoids missing file warnings during parse from the file checksum code for (unusual) images that set SRC_URI, such as build-appliance-image.

First half of the fix for [YOCTO #3146].

---
 meta/classes/multilib.bbclass |    1 +
 1 file changed, 1 insertion(+)
meta/classes/multilib.bbclass +1 -0
index b1a593e..4d3f889 100644
@@ -12,6 +12,7 @@ python multilib_virtclass_handler () {
         raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
 
     if bb.data.inherits_class('image', e.data):
+        e.data.setVar("MLPREFIX", variant + "-")
         e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
         return
 
Signature · 1 line
1.7.9.5
Tested-by on v2 2/2
#3 lore raw

Re: [PATCH v2 2/2] classes/multilib: prevent multilib extension of nativesdk recipes

In reply to Paul Eggleton
Quoted 9 lines · Paul Eggleton

It isn't supported to mix multilib and nativesdk in the same target, so explicitly skip multilib processing if nativesdk is inherited. As a bonus this fixes a bunch of related "missing file" warnings from the file checksum code during parsing because BPN was not correctly stripped for these targets.

Second half of the fix for [YOCTO #3146].

Quoted 26 lines
---
 meta/classes/multilib.bbclass |    3 +++
 1 file changed, 3 insertions(+)
meta/classes/multilib.bbclass +3 -1
index 4d3f889..7d5fc41 100644
@@ -19,6 +19,9 @@ python multilib_virtclass_handler () {
     if bb.data.inherits_class('native', e.data):
         raise bb.parse.SkipPackage("We can't extend native recipes")
 
+    if bb.data.inherits_class('nativesdk', e.data):
+        raise bb.parse.SkipPackage("We can't extend nativesdk recipes")
+
     save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
     for name in save_var_name.split():
         val=e.data.getVar(name, True)
--

1.7.9.5

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#4 lore raw
In reply to Paul Eggleton
Quoted 9 lines · Paul Eggleton

The following changes since commit 5e03d1e83d0536a2fc69a88d3e5407108836203f:

gcc: Use 4.7.2 release tarball (2012-09-21 14:55:26 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/multilib
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/multilib

Quoted 6 lines

Paul Eggleton (2):
classes/multilib: ensure MLPREFIX is set for image recipes classes/multilib: prevent multilib extension of nativesdk recipes

 meta/classes/multilib.bbclass |    4 ++++
 1 file changed, 4 insertions(+)

Merged to master, thanks.

Richard