summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-08-02 17:46:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-30 18:06:31 +0100
commit4e7e54246bb147d1e3c3d0c426ecaa730c389120 (patch)
tree7a8396bf5e0618acf76f4e5200c73738d804e62e /meta
parent118d74e28ca73135a7c0924a791a17847752e655 (diff)
downloadpoky-4e7e54246bb147d1e3c3d0c426ecaa730c389120.tar.gz
multilib.bbclass: Expand the WHITELISTs with multilib prefix
fix the following failures: ERROR: Nothing PROVIDES 'virtual/lib32-i586-pokymllib32-linux-compilerlibs' ERROR: Nothing RPROVIDES 'lib32-update-alternatives-cworth' (From OE-Core rev: a27d5b08d438861309827aecb731c29218679730) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/multilib.bbclass7
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index b04825f987..dac160e17e 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -50,6 +50,13 @@ python multilib_virtclass_handler () {
50 e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant) 50 e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
51 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) 51 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
52 52
53 # Expand the WHITELISTs with multilib prefix
54 for whitelist in ["HOSTTOOLS_WHITELIST_GPLv3", "WHITELIST_GPLv3", "LGPLv2_WHITELIST_GPLv3"]:
55 pkgs = e.data.getVar(whitelist, True)
56 for pkg in pkgs.split():
57 pkgs += " " + variant + "-" + pkg
58 e.data.setVar(whitelist, pkgs)
59
53 # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data 60 # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data
54 newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) 61 newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False)
55 if newtune: 62 if newtune: