Use canonical_license when doing evaluation of license expresion since INCOMPATIBLE_LICENSE are already canonized.
[YOCTO #8080] Signed-off-by: Aníbal Limón <[email protected]> --- 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 224d541..32e172a 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) -- 1.9.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
