summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-03-31 11:13:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-01 07:14:30 +0100
commitefe73cb5a74099ba2fab42a84fee9b825dd6adbd (patch)
treec578d2f961b33e1567a0958f542482604fd3c5ed
parent5293b834c1f5bfdf45d86485cd63b98c6b1bce5c (diff)
downloadpoky-efe73cb5a74099ba2fab42a84fee9b825dd6adbd.tar.gz
base.bbclass: drop obsolete HOSTTOOLS_WHITELIST_GPL-3.0
base.bbclass sets 'check_license' to False (and therefore skips license checking completely) for native, nativesdk, etc recipes (ie anything which could potentially be classed as "host tools"), so supporting a dedicated whitelist of GPLv3 host tools is not necessary. (From OE-Core rev: 8fc8b60005e7641861324c8541fb45058e7aab8e) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass25
-rw-r--r--meta/classes/multilib.bbclass2
-rw-r--r--meta/conf/distro/include/default-distrovars.inc3
3 files changed, 9 insertions, 21 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e066dc986f..ab8715e597 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -499,28 +499,21 @@ python () {
499 499
500 whitelist = [] 500 whitelist = []
501 incompatwl = [] 501 incompatwl = []
502 htincompatwl = []
503 for lic in bad_licenses: 502 for lic in bad_licenses:
504 spdx_license = return_spdx(d, lic) 503 spdx_license = return_spdx(d, lic)
505 for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]: 504 for w in ["LGPLv2_WHITELIST_", "WHITELIST_"]:
506 whitelist.extend((d.getVar(w + lic, True) or "").split()) 505 whitelist.extend((d.getVar(w + lic, True) or "").split())
507 if spdx_license: 506 if spdx_license:
508 whitelist.extend((d.getVar(w + spdx_license, True) or "").split()) 507 whitelist.extend((d.getVar(w + spdx_license, True) or "").split())
509 ''' 508 '''
510 We need to track what we are whitelisting and why. If pn is 509 We need to track what we are whitelisting and why. If pn is
511 incompatible and is not HOSTTOOLS_WHITELIST_ we need to be 510 incompatible we need to be able to note that the image that
512 able to note that the image that is created may infact 511 is created may infact contain incompatible licenses despite
513 contain incompatible licenses despite INCOMPATIBLE_LICENSE 512 INCOMPATIBLE_LICENSE being set.
514 being set.
515 ''' 513 '''
516 if "HOSTTOOLS" in w: 514 incompatwl.extend((d.getVar(w + lic, True) or "").split())
517 htincompatwl.extend((d.getVar(w + lic, True) or "").split()) 515 if spdx_license:
518 if spdx_license: 516 incompatwl.extend((d.getVar(w + spdx_license, True) or "").split())
519 htincompatwl.extend((d.getVar(w + spdx_license, True) or "").split())
520 else:
521 incompatwl.extend((d.getVar(w + lic, True) or "").split())
522 if spdx_license:
523 incompatwl.extend((d.getVar(w + spdx_license, True) or "").split())
524 517
525 if not pn in whitelist: 518 if not pn in whitelist:
526 recipe_license = d.getVar('LICENSE', True) 519 recipe_license = d.getVar('LICENSE', True)
@@ -546,8 +539,6 @@ python () {
546 elif pn in whitelist: 539 elif pn in whitelist:
547 if pn in incompatwl: 540 if pn in incompatwl:
548 bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted") 541 bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")
549 elif pn in htincompatwl:
550 bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted for HOSTTOOLS")
551 542
552 needsrcrev = False 543 needsrcrev = False
553 srcuri = d.getVar('SRC_URI', True) 544 srcuri = d.getVar('SRC_URI', True)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 052f911ac2..d5a31287a8 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -59,7 +59,7 @@ python multilib_virtclass_handler () {
59 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) 59 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
60 60
61 # Expand the WHITELISTs with multilib prefix 61 # Expand the WHITELISTs with multilib prefix
62 for whitelist in ["HOSTTOOLS_WHITELIST_GPL-3.0", "WHITELIST_GPL-3.0", "LGPLv2_WHITELIST_GPL-3.0"]: 62 for whitelist in ["WHITELIST_GPL-3.0", "LGPLv2_WHITELIST_GPL-3.0"]:
63 pkgs = e.data.getVar(whitelist, True) 63 pkgs = e.data.getVar(whitelist, True)
64 for pkg in pkgs.split(): 64 for pkg in pkgs.split():
65 pkgs += " " + variant + "-" + pkg 65 pkgs += " " + variant + "-" + pkg
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 9779bfb7bc..84cdaca0b2 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -22,9 +22,6 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
22 22
23IMAGE_FEATURES ?= "" 23IMAGE_FEATURES ?= ""
24 24
25# This is a list of packages that are used by the build system to build the distribution, they are not
26# directly part of the distribution.
27HOSTTOOLS_WHITELIST_GPL-3.0 ?= ""
28WHITELIST_GPL-3.0 ?= "" 25WHITELIST_GPL-3.0 ?= ""
29LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan libidn" 26LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan libidn"
30 27