diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-09-22 13:29:57 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-24 11:30:34 +0100 |
commit | 9ee8e2fae8b1d0b4d80378ee67e6366033863f6f (patch) | |
tree | 6450324b066816bc5432ba1e58d9bab9e44af2f6 /meta/classes | |
parent | d27d9e89576e8c067ceaee77fe8fb79603278eb3 (diff) | |
download | poky-9ee8e2fae8b1d0b4d80378ee67e6366033863f6f.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].
(From OE-Core rev: d9a1eb5054d487affb94431374a9cb1a735e2122)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/multilib.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 4d3f889931..7d5fc41535 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
@@ -19,6 +19,9 @@ python multilib_virtclass_handler () { | |||
19 | if bb.data.inherits_class('native', e.data): | 19 | if bb.data.inherits_class('native', e.data): |
20 | raise bb.parse.SkipPackage("We can't extend native recipes") | 20 | raise bb.parse.SkipPackage("We can't extend native recipes") |
21 | 21 | ||
22 | if bb.data.inherits_class('nativesdk', e.data): | ||
23 | raise bb.parse.SkipPackage("We can't extend nativesdk recipes") | ||
24 | |||
22 | save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or "" | 25 | save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or "" |
23 | for name in save_var_name.split(): | 26 | for name in save_var_name.split(): |
24 | val=e.data.getVar(name, True) | 27 | val=e.data.getVar(name, True) |