Patchwork [2/2] classes/multilib: prevent multilib extension of nativesdk recipes

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 21, 2012, 4:40 p.m.
Message ID <2364b5deb93745b2964fb46aebc460094fd227b6.1348245594.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/37013/
State New
Headers show

Comments

Paul Eggleton - Sept. 21, 2012, 4:40 p.m.
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].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/multilib.bbclass |    3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 25cf068..6923822 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -14,6 +14,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")
+
     # Set variables suitable for image recipes (as well as everything else)
     e.data.setVar("MLPREFIX", variant + "-")
     e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))