diff options
| author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-07-30 16:40:12 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-20 11:26:44 +0100 |
| commit | cd2c9acdbd75c83790e8144d2a834f5b5de35df0 (patch) | |
| tree | 3479375c4ea62f0c9dbf8e5af246e6341179fe91 /meta | |
| parent | 08f9fbbc97909698b56200aa9be5fe50b99a44b2 (diff) | |
| download | ast2050-yocto-poky-cd2c9acdbd75c83790e8144d2a834f5b5de35df0.zip ast2050-yocto-poky-cd2c9acdbd75c83790e8144d2a834f5b5de35df0.tar.gz | |
license_class: Fix choose_lic_set into incompatible license
Use canonical_license when doing evaluation of license expresion
since INCOMPATIBLE_LICENSE are already canonized.
[YOCTO #8080]
(From OE-Core rev: 64a4faf66f6d28acf575307079c1843a70efb71c)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/license.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index b62910b..9a8066c 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -359,7 +359,8 @@ def incompatible_license(d, dont_want_licenses, package=None): # Handles an "or" or two license sets provided by # flattened_licenses(), pick one that works if possible. def choose_lic_set(a, b): - return a if all(license_ok(lic) for lic in a) else b + return a if all(license_ok(canonical_license(d, lic)) for lic in a) \ + else b try: licenses = oe.license.flattened_licenses(license, choose_lic_set) |
