summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2022-06-25 17:52:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-27 23:11:12 +0100
commitf869136518a8a132acb88c84afce23ee4ab3c8ec (patch)
tree502b324f7b819dc08fd0fcd35474be808c0401f0
parent8b428691368b2cfe8256a81f506a278e01d09f8c (diff)
downloadpoky-f869136518a8a132acb88c84afce23ee4ab3c8ec.tar.gz
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. (From OE-Core rev: 3ad994d95815eefed2a72b675c7a323b3ed38191) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 20968a5076..cc02de5f77 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -594,9 +594,9 @@ python () {
594 594
595 for lic_exception in exceptions: 595 for lic_exception in exceptions:
596 if ":" in lic_exception: 596 if ":" in lic_exception:
597 lic_exception.split(":")[0] 597 lic_exception = lic_exception.split(":")[1]
598 if lic_exception in oe.license.obsolete_license_list(): 598 if lic_exception in oe.license.obsolete_license_list():
599 bb.fatal("Invalid license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception) 599 bb.fatal("Obsolete license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception)
600 600
601 pkgs = d.getVar('PACKAGES').split() 601 pkgs = d.getVar('PACKAGES').split()
602 skipped_pkgs = {} 602 skipped_pkgs = {}