summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-14 21:46:17 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-14 21:54:50 (GMT)
commit0a4a7578b84059d598aa775cc6362e1ef68ec3b3 (patch)
treea9b91e833060a44133bb845387e14ea374929514 /meta/classes
parent6ea6facd662fd7127c1cd8479eb67cf0ba71476c (diff)
downloadpoky-0a4a7578b84059d598aa775cc6362e1ef68ec3b3.tar.gz
mulitlib.bbclass: Ensure correct value of ALL_MULTILIB_PACKAGE_ARCHS is preserved
The value of ALL_MULTILIB_PACKAGE_ARCHS needs to be consistent both in multilib extended recipes and in normal context. If this isn't the case it can lead to inconsistent configuration files at a minimum. This patch ensures the value is preserved during the class extension code since computing it after that point is hard. [YOCTO #2290] (From OE-Core rev: 529bc145152bb36d9696226b93729377a3b6a240) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 61b7765..c2d2f85 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -20,6 +20,9 @@ python multilib_virtclass_handler () {
20 val=e.data.getVar(name, True) 20 val=e.data.getVar(name, True)
21 if val: 21 if val:
22 e.data.setVar(name + "_MULTILIB_ORIGINAL", val) 22 e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
23
24 # Expand this since this won't work correctly once we set a multilib into place
25 e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True))
23 26
24 override = ":virtclass-multilib-" + variant 27 override = ":virtclass-multilib-" + variant
25 28