summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-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)