[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
Fri Aug 14 07:31:19 UTC 2015
Module: openembedded-core.git
Branch: dizzy
Commit: 8687b8bb8233e7f867539d69463671aa9c0806e9
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8687b8bb8233e7f867539d69463671aa9c0806e9
Author: Aníbal Limón <anibal.limon at linux.intel.com>
Date: Thu Jul 30 16:40:11 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 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index d03b9eb..91d8bab 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)
More information about the Openembedded-commits
mailing list