sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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]

(From OE-Core rev: 799b25e09a149303edc1c098935f38a438878a95)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón 2015-07-30 16:40:13 -05:00 committed by Richard Purdie
parent 4d027f03cc
commit b850da9224
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/license.bbclass
View File

@ -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)