summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-10-15 20:31:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:18:28 +0000
commitd0c969eeab1536c5da9813413943cbaa933ec9fe (patch)
treede2dbae97c8bf681bb6d8fbb1c481f95022576e6 /meta/classes
parent6af63cc898106fab45b1d74cd7ba24ef5ee0afa4 (diff)
downloadpoky-d0c969eeab1536c5da9813413943cbaa933ec9fe.tar.gz
multilib.bbclass/package_manager.py: fix <multilib>-meta-toolchain build failure
There is a failure to build lib32-meta-toolchain: ... |ERROR: lib32-packagegroup-core-standalone-sdk-target not found in the base feeds (qemux86_64 x86 noarch any all). ... In package_manager.py, the variable 'DEFAULTTUNE_virtclass-multilib-lib32' is used to process multilib image/toolchain. But for the build of lib32- meta-toolchain, the value of 'DEFAULTTUNE_virtclass-multilib-lib32' is deleted. In 'bitbake lib32-meta-toolchain -e', we got: ... |# $DEFAULTTUNE_virtclass-multilib-lib32 [2 operations] |# set? /home/jiahongxu/yocto/build-20141010-yocto/conf/local.conf:237 |# "x86" |# del data_smart.py:406 [finalize] |# "" |# pre-expansion value: |# "None" ... The commit 899d45b90061eb3cf3e71029072eee42cd80930c in oe-core deleted it at DataSmart.finalize ... Author: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Tue May 31 23:52:50 2011 +0100 bitbake/data_smart: Change overrides behaviour to remove expanded variables from the datastore ... We add an internal variable 'DEFAULTTUNE_ML_<multilib>', assign it with the value of 'DEFAULTTUNE_virtclass-multilib-lib32' before deleting. For rpm backend in package_manager.py, we use DEFAULTTUNE_virtclass-multilib -lib32 first, if it is not available, and try to use DEFAULTTUNE_ML_<multilib> [YOCTO #6842] (From OE-Core rev: 9c59d3d8b538d3a98ff4b5e5b189a4a23a85da2d) (From OE-Core rev: e5fcc237807d064578028ecf8af51d82c5a66c18) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/multilib.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 2a90d9ef29..eea2fd59a1 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -63,6 +63,7 @@ python multilib_virtclass_handler () {
63 newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) 63 newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False)
64 if newtune: 64 if newtune:
65 e.data.setVar("DEFAULTTUNE", newtune) 65 e.data.setVar("DEFAULTTUNE", newtune)
66 e.data.setVar('DEFAULTTUNE_ML_%s' % variant, newtune)
66} 67}
67 68
68addhandler multilib_virtclass_handler 69addhandler multilib_virtclass_handler