[oe-commits] Richard Purdie : mulitlib.bbclass: Ensure correct value of ALL_MULTILIB_PACKAGE_ARCHS is preserved

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 529bc145152bb36d9696226b93729377a3b6a240
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=529bc145152bb36d9696226b93729377a3b6a240

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sat Apr 14 22:46:17 2012 +0100

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]

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 61b7765..c2d2f85 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