summaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-17 15:41:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-19 00:09:01 +0100
commitba197e6ff3bd511463d4b64629a1344d593073f2 (patch)
treef21b23fa52515c5afe2670a975f572dd9bcbbb72 /meta/classes/base.bbclass
parenta9710bcfefcfe9fd4293d72b3ca477e397dd3f33 (diff)
downloadpoky-ba197e6ff3bd511463d4b64629a1344d593073f2.tar.gz
license.bbclass: canonicalise licenses when dealing with INCOMPATIBLE_LICENSE
If INCOMPATIBLE_LICENSE=GPL-3.0 but the recipe sets LICENSE=GPLv3, the current code won't trigger because they're different strings. Fix this by attempting to canonicalise every license name to a SPDX name, so both names in this example become GPL-3.0. [ YOCTO #5622 ] (From OE-Core rev: 8998e13fc95f11d15c34fb09d8451a9d4b69f2f1) 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.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index c0d2c8ec88..8114cf648b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -540,6 +540,8 @@ python () {
540 check_license = False 540 check_license = False
541 541
542 if check_license and bad_licenses: 542 if check_license and bad_licenses:
543 bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses)
544
543 whitelist = [] 545 whitelist = []
544 for lic in bad_licenses: 546 for lic in bad_licenses:
545 for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]: 547 for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]: