From 799b25e09a149303edc1c098935f38a438878a95 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Thu, 30 Jul 2015 16:40:13 -0500 Subject: license_class: Fix choose_lic_set into incompatible license MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use canonical_license when doing evaluation of license expresion since INCOMPATIBLE_LICENSE are already canonized. [YOCTO #8080] Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 4 ++-- 1 file 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): # Handles an "or" or two license sets provided by # flattened_licenses(), pick one that works if possible. def choose_lic_set(a, b): - return a if all(oe.license.license_ok(lic, dont_want_licenses) \ - for lic in a) else b + return a if all(oe.license.license_ok(canonical_license(d, lic), + dont_want_licenses) for lic in a) else b try: licenses = oe.license.flattened_licenses(license, choose_lic_set) -- cgit 1.2.3-korg