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