]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
base.bbclass: Correct the test for obsolete license exceptions
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Sat, 25 Jun 2022 15:52:23 +0000 (17:52 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 27 Jun 2022 22:10:52 +0000 (23:10 +0100)
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>
meta/classes/base.bbclass

index 20968a5076687b1d80b461854158e6a4e9fff3ff..cc02de5f77ed7b6fa5e40c39c58625421091c4c3 100644 (file)
@@ -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 = {}