From f869136518a8a132acb88c84afce23ee4ab3c8ec Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 25 Jun 2022 17:52:23 +0200 Subject: base.bbclass: Correct the test for obsolete license exceptions The test for obsolete licenses used in INCOMPATIBLE_LICENSE_EXCEPTIONS tried to match the ":" tuples with the obsolete licenses and thus never matched anything. (From OE-Core rev: 3ad994d95815eefed2a72b675c7a323b3ed38191) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/base.bbclass') 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 () { 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 = {} -- cgit v1.2.3-54-g00ecf