From 5f78cf9b4ee56937298eaa55a6fddabae8dd8bd4 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 15 Dec 2014 16:55:10 +0800 Subject: base/license.bbclass: expand wildcards in INCOMPATIBLE_LICENSE The whitelist processing in code in base.bbclass does not play well with wildcards in INCOMPATIBLE_LICENSES. The code expects bad_licenses to contain actual license names, not wildcards. Add incompatible_license_contains to replace bb.utils.contains( "INCOMPATIBLE_LICENSE", **, **, **, d) [YOCTO #5592] (From OE-Core rev: 3587653a8d8abc7cfed6a5c6ecfa72bee283e451) Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/base.bbclass') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index de81a7d687..06cfe260ac 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -443,7 +443,7 @@ python () { check_license = False if check_license and bad_licenses: - bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses) + bad_licenses = expand_wildcard_licenses(d, bad_licenses) whitelist = [] for lic in bad_licenses: -- cgit v1.2.3-54-g00ecf