summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-11 17:02:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-22 13:13:32 +0100
commit14a5089e812f9ae9e42a915ab92bdd792a3a04dc (patch)
treec494b2058c04ed02972243cf053841089baeb452 /meta/classes
parenta460d97320d00b874812bb5287287a4fcda43b5c (diff)
downloadpoky-14a5089e812f9ae9e42a915ab92bdd792a3a04dc.tar.gz
default-distrovars.inc: drop obsolete LGPLv2_WHITELIST_GPL-3.0
There doesn't seem to be a clear reason to have two separate variables to hold whitelisted GPLv3 recipes. Both variables are treated the same, so adding a recipe to LGPLv2_WHITELIST_GPL-3.0 is already equivalent to adding it to WHITELIST_GPL-3.0. Anyone needing to whitelist a GPLv3 recipe should now just use WHITELIST_GPL-3.0. (From OE-Core rev: d4dea76fbe9765d489e3e522a9d2c22049610c7b) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass25
-rw-r--r--meta/classes/multilib.bbclass12
2 files changed, 17 insertions, 20 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d5798f9c48..7c42cf95e1 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -520,19 +520,18 @@ python () {
520 incompatwl = [] 520 incompatwl = []
521 for lic in bad_licenses: 521 for lic in bad_licenses:
522 spdx_license = return_spdx(d, lic) 522 spdx_license = return_spdx(d, lic)
523 for w in ["LGPLv2_WHITELIST_", "WHITELIST_"]: 523 whitelist.extend((d.getVar("WHITELIST_" + lic) or "").split())
524 whitelist.extend((d.getVar(w + lic) or "").split()) 524 if spdx_license:
525 if spdx_license: 525 whitelist.extend((d.getVar("WHITELIST_" + spdx_license) or "").split())
526 whitelist.extend((d.getVar(w + spdx_license) or "").split()) 526 '''
527 ''' 527 We need to track what we are whitelisting and why. If pn is
528 We need to track what we are whitelisting and why. If pn is 528 incompatible we need to be able to note that the image that
529 incompatible we need to be able to note that the image that 529 is created may infact contain incompatible licenses despite
530 is created may infact contain incompatible licenses despite 530 INCOMPATIBLE_LICENSE being set.
531 INCOMPATIBLE_LICENSE being set. 531 '''
532 ''' 532 incompatwl.extend((d.getVar("WHITELIST_" + lic) or "").split())
533 incompatwl.extend((d.getVar(w + lic) or "").split()) 533 if spdx_license:
534 if spdx_license: 534 incompatwl.extend((d.getVar("WHITELIST_" + spdx_license) or "").split())
535 incompatwl.extend((d.getVar(w + spdx_license) or "").split())
536 535
537 if not pn in whitelist: 536 if not pn in whitelist:
538 pkgs = d.getVar('PACKAGES').split() 537 pkgs = d.getVar('PACKAGES').split()
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)