[oe-commits] =?UTF-8?Q?An=C3=ADbal=20Lim=C3=B3n=20?=: license_class: Fix choose_lic_set into incompatible license
git at git.openembedded.org
git at git.openembedded.org
Sat Aug 1 06:35:20 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: 799b25e09a149303edc1c098935f38a438878a95
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=799b25e09a149303edc1c098935f38a438878a95
Author: Aníbal Limón <anibal.limon at linux.intel.com>
Date: Thu Jul 30 16:40:13 2015 -0500
license_class: Fix choose_lic_set into incompatible license
Use canonical_license when doing evaluation of license expresion since
INCOMPATIBLE_LICENSE are already canonized.
[YOCTO #8080]
Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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)
More information about the Openembedded-commits
mailing list