summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-07-30 16:40:11 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-20 11:26:53 +0100
commitf1c45d15c20c99f121abf63d50a1560758a970e4 (patch)
tree18463f2f1107f785cdfa97fbc8818e33b0bf005f /meta/classes
parentfd35017edf5ce338640fe10edbc94d2e58c0628c (diff)
downloadpoky-f1c45d15c20c99f121abf63d50a1560758a970e4.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: 8687b8bb8233e7f867539d69463671aa9c0806e9) 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.bbclass3
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):
314 # Handles an "or" or two license sets provided by 314 # Handles an "or" or two license sets provided by
315 # flattened_licenses(), pick one that works if possible. 315 # flattened_licenses(), pick one that works if possible.
316 def choose_lic_set(a, b): 316 def choose_lic_set(a, b):
317 return a if all(license_ok(lic) for lic in a) else b 317 return a if all(license_ok(canonical_license(d, lic)) for lic in a) \
318 else b
318 319
319 try: 320 try:
320 licenses = oe.license.flattened_licenses(license, choose_lic_set) 321 licenses = oe.license.flattened_licenses(license, choose_lic_set)