summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/multilib.bbclass')
-rw-r--r--meta/classes/multilib.bbclass12
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 519c1a55ba..5f9dc311f4 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -49,7 +49,6 @@ python multilib_virtclass_handler () {
49 if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data): 49 if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
50 raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups") 50 raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
51 51
52
53 # Expand this since this won't work correctly once we set a multilib into place 52 # Expand this since this won't work correctly once we set a multilib into place
54 e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS")) 53 e.data.setVar("ALL_MULTILIB_PACKAGE_ARCHS", e.data.getVar("ALL_MULTILIB_PACKAGE_ARCHS"))
55 54
@@ -65,12 +64,11 @@ python multilib_virtclass_handler () {
65 e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) 64 e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
66 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) 65 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
67 66
68 # Expand the WHITELISTs with multilib prefix 67 # Expand WHITELIST_GPL-3.0 with multilib prefix
69 for whitelist in ["WHITELIST_GPL-3.0", "LGPLv2_WHITELIST_GPL-3.0"]: 68 pkgs = e.data.getVar("WHITELIST_GPL-3.0")
70 pkgs = e.data.getVar(whitelist) 69 for pkg in pkgs.split():
71 for pkg in pkgs.split(): 70 pkgs += " " + variant + "-" + pkg
72 pkgs += " " + variant + "-" + pkg 71 e.data.setVar("WHITELIST_GPL-3.0", pkgs)
73 e.data.setVar(whitelist, pkgs)
74 72
75 # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data 73 # DEFAULTTUNE can change TARGET_ARCH override so expand this now before update_data
76 newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False) 74 newtune = e.data.getVar("DEFAULTTUNE_" + "virtclass-multilib-" + variant, False)