diff options
| author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-07-30 16:40:11 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-13 18:54:29 -0700 |
| commit | 8687b8bb8233e7f867539d69463671aa9c0806e9 (patch) | |
| tree | 72a053d6dd0ae0278f5a47997d274c2c2c8939dc /meta/classes | |
| parent | 5f50f90ed824ea6a8d1d1b41a5345f51a15c443f (diff) | |
| download | openembedded-core-8687b8bb8233e7f867539d69463671aa9c0806e9.tar.gz openembedded-core-8687b8bb8233e7f867539d69463671aa9c0806e9.tar.bz2 openembedded-core-8687b8bb8233e7f867539d69463671aa9c0806e9.zip | |
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]
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/classes')
| -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 d03b9eb805..91d8bab845 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -314,7 +314,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) |