summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 b62910bf26..9a8066cdbb 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -359,7 +359,8 @@ def incompatible_license(d, dont_want_licenses, package=None):
359 # Handles an "or" or two license sets provided by 359 # Handles an "or" or two license sets provided by
360 # flattened_licenses(), pick one that works if possible. 360 # flattened_licenses(), pick one that works if possible.
361 def choose_lic_set(a, b): 361 def choose_lic_set(a, b):
362 return a if all(license_ok(lic) for lic in a) else b 362 return a if all(license_ok(canonical_license(d, lic)) for lic in a) \
363 else b
363 364
364 try: 365 try:
365 licenses = oe.license.flattened_licenses(license, choose_lic_set) 366 licenses = oe.license.flattened_licenses(license, choose_lic_set)