summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-02-11 18:04:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 22:49:07 +0000
commit45528026c190c7c3b121e9fb65747d050b2bb21a (patch)
tree0265596b0b88daa79cf5d1847f17845edc9c27fd /meta/classes
parenteed7294ba9aedf47af5c64ff11777015e59f48ef (diff)
downloadopenembedded-core-45528026c190c7c3b121e9fb65747d050b2bb21a.tar.gz
openembedded-core-45528026c190c7c3b121e9fb65747d050b2bb21a.tar.bz2
openembedded-core-45528026c190c7c3b121e9fb65747d050b2bb21a.zip
multilib.bbclass: save multilib variables before executing the gcc-cross-canadian statements
Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/multilib.bbclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index f1696b6b7c..a999b69b2a 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -15,6 +15,12 @@ python multilib_virtclass_handler () {
if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data):
raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
+ save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
+ for name in save_var_name.split():
+ val=e.data.getVar(name, True)
+ if val:
+ e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
+
if bb.data.inherits_class('image', e.data):
e.data.setVar("MLPREFIX", variant + "-")
e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
@@ -36,11 +42,6 @@ python multilib_virtclass_handler () {
if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups")
- save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
- for name in save_var_name.split():
- val=e.data.getVar(name, True)
- if val:
- e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
# Expand this since this won't work correctly once we set a multilib into place
e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True))