From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Sat, 25 Jun 2022 15:52:23 +0000 (+0200)
Subject: base.bbclass: Correct the test for obsolete license exceptions
X-Git-Tag: uninative-3.7~492
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ad994d95815eefed2a72b675c7a323b3ed38191;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

base.bbclass: Correct the test for obsolete license exceptions

The test for obsolete licenses used in INCOMPATIBLE_LICENSE_EXCEPTIONS
tried to match the "<package>:<license>" tuples with the obsolete
licenses and thus never matched anything.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 20968a50766..cc02de5f77e 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -594,9 +594,9 @@ python () {
 
             for lic_exception in exceptions:
                 if ":" in lic_exception:
-                    lic_exception.split(":")[0]
+                    lic_exception = lic_exception.split(":")[1]
                 if lic_exception in oe.license.obsolete_license_list():
-                    bb.fatal("Invalid license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception)
+                    bb.fatal("Obsolete license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception)
 
             pkgs = d.getVar('PACKAGES').split()
             skipped_pkgs = {}