diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-05-11 17:02:04 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-22 13:13:32 +0100 |
commit | 14a5089e812f9ae9e42a915ab92bdd792a3a04dc (patch) | |
tree | c494b2058c04ed02972243cf053841089baeb452 /meta/classes/base.bbclass | |
parent | a460d97320d00b874812bb5287287a4fcda43b5c (diff) | |
download | openembedded-core-contrib-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/base.bbclass')
-rw-r--r-- | meta/classes/base.bbclass | 25 |
1 files changed, 12 insertions, 13 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 () { incompatwl = [] for lic in bad_licenses: spdx_license = return_spdx(d, lic) - for w in ["LGPLv2_WHITELIST_", "WHITELIST_"]: - whitelist.extend((d.getVar(w + lic) or "").split()) - if spdx_license: - whitelist.extend((d.getVar(w + spdx_license) or "").split()) - ''' - 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. - ''' - incompatwl.extend((d.getVar(w + lic) or "").split()) - if spdx_license: - incompatwl.extend((d.getVar(w + spdx_license) or "").split()) + whitelist.extend((d.getVar("WHITELIST_" + lic) or "").split()) + if spdx_license: + whitelist.extend((d.getVar("WHITELIST_" + spdx_license) or "").split()) + ''' + 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. + ''' + incompatwl.extend((d.getVar("WHITELIST_" + lic) or "").split()) + if spdx_license: + incompatwl.extend((d.getVar("WHITELIST_" + spdx_license) or "").split()) if not pn in whitelist: pkgs = d.getVar('PACKAGES').split() |