diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-12-15 16:55:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-19 18:08:00 +0000 |
commit | 5f78cf9b4ee56937298eaa55a6fddabae8dd8bd4 (patch) | |
tree | ed6f1ec3647ddd2839cc2fcbceec0599c965ff88 /meta/classes/base.bbclass | |
parent | fc518325c64040e6bbd47cfb7f40f0fd363c17d2 (diff) | |
download | poky-5f78cf9b4ee56937298eaa55a6fddabae8dd8bd4.tar.gz |
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 <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r-- | meta/classes/base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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 () { | |||
443 | check_license = False | 443 | check_license = False |
444 | 444 | ||
445 | if check_license and bad_licenses: | 445 | if check_license and bad_licenses: |
446 | bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses) | 446 | bad_licenses = expand_wildcard_licenses(d, bad_licenses) |
447 | 447 | ||
448 | whitelist = [] | 448 | whitelist = [] |
449 | for lic in bad_licenses: | 449 | for lic in bad_licenses: |