From f1c45d15c20c99f121abf63d50a1560758a970e4 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Thu, 30 Jul 2015 16:40:11 -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] (From OE-Core rev: 8687b8bb8233e7f867539d69463671aa9c0806e9) Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') 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): # 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(license_ok(lic) for lic in a) else b + return a if all(license_ok(canonical_license(d, lic)) for lic in a) \ + else b try: licenses = oe.license.flattened_licenses(license, choose_lic_set) -- cgit v1.2.3-54-g00ecf