diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-14 22:46:17 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-14 22:52:04 +0100 |
| commit | 529bc145152bb36d9696226b93729377a3b6a240 (patch) | |
| tree | ac8cf031913345a2047cb4fef0d41bc905c0f5a7 | |
| parent | 2878d19c4e19d76cb8be15825c40ff03f25f35f5 (diff) | |
| download | openembedded-core-529bc145152bb36d9696226b93729377a3b6a240.tar.gz openembedded-core-529bc145152bb36d9696226b93729377a3b6a240.tar.bz2 openembedded-core-529bc145152bb36d9696226b93729377a3b6a240.zip | |
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@linuxfoundation.org>
| -rw-r--r-- | 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 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 |