From 0a4a7578b84059d598aa775cc6362e1ef68ec3b3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 14 Apr 2012 22:46:17 +0100 Subject: 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 --- meta/classes/multilib.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta') diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 61b77655f9..c2d2f85a12 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -20,6 +20,9 @@ python multilib_virtclass_handler () { 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)) override = ":virtclass-multilib-" + variant -- cgit v1.2.3-54-g00ecf