diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2016-03-31 11:13:06 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-31 23:02:27 +0100 |
| commit | 8fc8b60005e7641861324c8541fb45058e7aab8e (patch) | |
| tree | 6daf6d20003c686f31ed37b052e394924a3e1619 /meta/classes/base.bbclass | |
| parent | c0e0d061d94a1ed2930cbf9a9445cf8cb9f4f9b3 (diff) | |
| download | openembedded-core-contrib-8fc8b60005e7641861324c8541fb45058e7aab8e.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.
Signed-off-by: Andre McCurdy <armccurdy@gmail.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, 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) |