Patchwork [1/1] multilib.bbclass: Expand the WHITELISTs with multilib prefix

login
register
mail settings
Submitter jackie huang
Date Aug. 2, 2013, 9:46 a.m.
Message ID <0dcd18de7a77c7395798b87f6833b388f3e0bb6c.1375436283.git.jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/54973/
State Accepted
Commit a27d5b08d438861309827aecb731c29218679730
Headers show

Comments

jackie huang - Aug. 2, 2013, 9:46 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

fix the following failures:
ERROR: Nothing PROVIDES 'virtual/lib32-i586-pokymllib32-linux-compilerlibs'
ERROR: Nothing RPROVIDES 'lib32-update-alternatives-cworth'

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/classes/multilib.bbclass |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index b04825f..dac160e 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: