aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-22 13:29:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-24 11:18:46 +0100
commitd9a1eb5054d487affb94431374a9cb1a735e2122 (patch)
tree569ff412967842ab1ee8bae2f9a3ce3881295d06
parentddec9a1b45159c75e97e92abe9a940268acd84b2 (diff)
downloadopenembedded-core-contrib-d9a1eb5054d487affb94431374a9cb1a735e2122.tar.gz
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]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/multilib.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 4d3f8899311..7d5fc415353 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -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)