summaryrefslogtreecommitdiffstats
path: root/meta
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:26 +0000
commite9aa4c22d6cd41d8a498e7bc8aca258e90561b55 (patch)
tree6a960ab9e0a37898ec5498b1a9e373fb19bde932 /meta
parent2c87657be94b8eb0b4a7abc6afee2e96d847e6e9 (diff)
downloadpoky-e9aa4c22d6cd41d8a498e7bc8aca258e90561b55.tar.gz
multilib.bbclass: save multilib variables before executing the gcc-cross-canadian statements
(From OE-Core rev: 45528026c190c7c3b121e9fb65747d050b2bb21a) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () {
15 if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data): 15 if "virtual/kernel" in provides or bb.data.inherits_class('module-base', e.data):
16 raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel") 16 raise bb.parse.SkipPackage("We shouldn't have multilib variants for the kernel")
17 17
18 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
19 for name in save_var_name.split():
20 val=e.data.getVar(name, True)
21 if val:
22 e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
23
18 if bb.data.inherits_class('image', e.data): 24 if bb.data.inherits_class('image', e.data):
19 e.data.setVar("MLPREFIX", variant + "-") 25 e.data.setVar("MLPREFIX", variant + "-")
20 e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) 26 e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
@@ -36,11 +42,6 @@ python multilib_virtclass_handler () {
36 if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data): 42 if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
37 raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups") 43 raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups")
38 44
39 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
40 for name in save_var_name.split():
41 val=e.data.getVar(name, True)
42 if val:
43 e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
44 45
45 # Expand this since this won't work correctly once we set a multilib into place 46 # Expand this since this won't work correctly once we set a multilib into place
46 e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True)) 47 e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True))