From ba197e6ff3bd511463d4b64629a1344d593073f2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 17 Jul 2014 15:41:05 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/classes/base.bbclass') 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 () { check_license = False if check_license and bad_licenses: + bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses) + whitelist = [] for lic in bad_licenses: for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]: -- cgit v1.2.3-54-g00ecf