aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass25
1 files changed, 8 insertions, 17 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 () {
whitelist = []
incompatwl = []
- htincompatwl = []
for lic in bad_licenses:
spdx_license = return_spdx(d, lic)
- for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]:
+ for w in ["LGPLv2_WHITELIST_", "WHITELIST_"]:
whitelist.extend((d.getVar(w + lic, True) or "").split())
if spdx_license:
whitelist.extend((d.getVar(w + spdx_license, True) or "").split())
'''
- We need to track what we are whitelisting and why. If pn is
- incompatible and is not HOSTTOOLS_WHITELIST_ we need to be
- able to note that the image that is created may infact
- contain incompatible licenses despite INCOMPATIBLE_LICENSE
- being set.
+ We need to track what we are whitelisting and why. If pn is
+ incompatible we need to be able to note that the image that
+ is created may infact contain incompatible licenses despite
+ INCOMPATIBLE_LICENSE being set.
'''
- if "HOSTTOOLS" in w:
- htincompatwl.extend((d.getVar(w + lic, True) or "").split())
- if spdx_license:
- htincompatwl.extend((d.getVar(w + spdx_license, True) or "").split())
- else:
- incompatwl.extend((d.getVar(w + lic, True) or "").split())
- if spdx_license:
- incompatwl.extend((d.getVar(w + spdx_license, True) or "").split())
+ incompatwl.extend((d.getVar(w + lic, True) or "").split())
+ if spdx_license:
+ incompatwl.extend((d.getVar(w + spdx_license, True) or "").split())
if not pn in whitelist:
recipe_license = d.getVar('LICENSE', True)
@@ -546,8 +539,6 @@ python () {
elif pn in whitelist:
if pn in incompatwl:
bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")
- elif pn in htincompatwl:
- bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted for HOSTTOOLS")
needsrcrev = False
srcuri = d.getVar('SRC_URI', True)