summaryrefslogtreecommitdiffstats
path: root/meta/classes/license.bbclass
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-08-01 07:34:08 +0100
commitb850da9224d8af4bde058820291cdcbfbb112121 (patch)
treed305785b35e746dc0fb16751f877375cbed3c776 /meta/classes/license.bbclass
parent4d027f03ccb5facd71a0309b352a571dc1e6a4c6 (diff)
downloadpoky-b850da9224d8af4bde058820291cdcbfbb112121.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: 799b25e09a149303edc1c098935f38a438878a95) 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/license.bbclass')
-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):
375 # Handles an "or" or two license sets provided by 375 # Handles an "or" or two license sets provided by
376 # flattened_licenses(), pick one that works if possible. 376 # flattened_licenses(), pick one that works if possible.
377 def choose_lic_set(a, b): 377 def choose_lic_set(a, b):
378 return a if all(oe.license.license_ok(lic, dont_want_licenses) \ 378 return a if all(oe.license.license_ok(canonical_license(d, lic),
379 for lic in a) else b 379 dont_want_licenses) for lic in a) else b
380 380
381 try: 381 try:
382 licenses = oe.license.flattened_licenses(license, choose_lic_set) 382 licenses = oe.license.flattened_licenses(license, choose_lic_set)