summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-07-30 16:40:13 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-31 15:40:03 +0100
commit799b25e09a149303edc1c098935f38a438878a95 (patch)
treed651f1f734ed956a8e5fcc282446ba8d03049399
parentf7d0c03dc3cbfb79d22e1d89e31026a97c5b12ae (diff)
downloadopenembedded-core-contrib-799b25e09a149303edc1c098935f38a438878a95.tar.gz
openembedded-core-contrib-799b25e09a149303edc1c098935f38a438878a95.tar.bz2
openembedded-core-contrib-799b25e09a149303edc1c098935f38a438878a95.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>
-rw-r--r--meta/classes/license.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 224d541f75..32e172afc7 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -375,8 +375,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(oe.license.license_ok(lic, dont_want_licenses) \
- for lic in a) else b
+ return a if all(oe.license.license_ok(canonical_license(d, lic),
+ dont_want_licenses) for lic in a) else b
try:
licenses = oe.license.flattened_licenses(license, choose_lic_set)