From 4e7e54246bb147d1e3c3d0c426ecaa730c389120 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 2 Aug 2013 17:46:40 +0800 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 7 +++++++ 1 file changed, 7 insertions(+) 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 () { e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant) e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) + # Expand the WHITELISTs with multilib prefix + for whitelist in ["HOSTTOOLS_WHITELIST_GPLv3", "WHITELIST_GPLv3", "LGPLv2_WHITELIST_GPLv3"]: + pkgs = e.data.getVar(whitelist, True) + for pkg in pkgs.split(): + pkgs += " " + variant + "-" + pkg + e.data.setVar(whitelist, pkgs) + # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) if newtune: