diff options
| -rw-r--r-- | meta/classes/base.bbclass | 25 | ||||
| -rw-r--r-- | meta/classes/multilib.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 3 |
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 () { 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) 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 () { 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 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}" 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" |