sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Andre McCurdy 2016-03-31 11:13:06 -07:00 committed by Richard Purdie
parent 5293b834c1
commit efe73cb5a7
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta/classes/base.bbclass
View File

@ -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)

2
meta/classes/multilib.bbclass
View File

@ -59,7 +59,7 @@ python multilib_virtclass_handler () {
e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
# Expand the WHITELISTs with multilib prefix
for whitelist in ["HOSTTOOLS_WHITELIST_GPL-3.0", "WHITELIST_GPL-3.0", "LGPLv2_WHITELIST_GPL-3.0"]:
for whitelist in ["WHITELIST_GPL-3.0", "LGPLv2_WHITELIST_GPL-3.0"]:
pkgs = e.data.getVar(whitelist, True)
for pkg in pkgs.split():
pkgs += " " + variant + "-" + pkg

3
meta/conf/distro/include/default-distrovars.inc
View File

@ -22,9 +22,6 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}"
IMAGE_FEATURES ?= ""
# This is a list of packages that are used by the build system to build the distribution, they are not
# directly part of the distribution.
HOSTTOOLS_WHITELIST_GPL-3.0 ?= ""
WHITELIST_GPL-3.0 ?= ""
LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan libidn"