From: Aníbal Limón <anibal.limon@linux.intel.com>
Date: Thu, 30 Jul 2015 21:40:11 +0000 (-0500)
Subject: license_class: Fix choose_lic_set into incompatible license
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8687b8bb8233e7f867539d69463671aa9c0806e9;p=openembedded-core.git

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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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)