aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-11-03 15:59:39 +0800
committerRobert Yang <liezhi.yang@windriver.com>2017-11-22 11:03:31 +0800
commit8fcb0aae9be25248319e29a9a1338afc167a9ed9 (patch)
treec56d60d5b2eb97194fe164f72c74f51e87c592ae
parent9d2f53071c0e2c8ca71dce2835e319de682a81e1 (diff)
downloadopenembedded-core-contrib-8fcb0aae9be25248319e29a9a1338afc167a9ed9.tar.gz
toolchain-scripts.bbclass: only install all MULTILIB_VARIANTS for image
Install all MULTILIB_VARIANTS to sysroot and pack them only makes sense to image recipe, so limit it to image recipe only, and it can fix: MACHINE = "qemux86-64" require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "core2-32" $ bitbake lib32-meta-ide-support WARNING: lib32-meta-ide-support-1.0-r3 do_configure: Manifest for ncurses not found, searched manifests: /workspace2/lyang1/test_mlwarn/tmp-glibc/sstate-control/manifest-qemux86_64-ncurses.populate_sysroot /workspace2/lyang1/test_mlwarn/tmp-glibc/sstate-control/manifest-core2-32-ncurses.populate_sysroot /workspace2/lyang1/test_mlwarn/tmp-glibc/sstate-control/manifest-i586-ncurses.populate_sysroot /workspace2/lyang1/test_mlwarn/tmp-glibc/sstate-control/manifest-x86-ncurses.populate_sysroot /workspace2/lyang1/test_mlwarn/tmp-glibc/sstate-control/manifest-allarch-ncurses.populate_sysroot This is because core2-64 is not in lib32-meta-ide-support's PACKAGE_ARCHS which doesn't like image recipe (lib32-image recipe's DEFAULTTUNE is not overridded) [YOCTO #12298] Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/classes/toolchain-scripts.bbclass6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 9bcfe708c7..1721884389 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -151,6 +151,12 @@ toolchain_create_sdk_siteconfig[vardepsexclude] = "TOOLCHAIN_CONFIGSITE_SYSROOTC
python __anonymous () {
import oe.classextend
+
+ # Install all MULTILIB_VARIANTS to sysroot and pack them only makes sense to
+ # image recipe.
+ if not bb.data.inherits_class('image', d):
+ return
+
deps = ""
for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE') or "").split():
deps += " %s:do_populate_sysroot" % dep