diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2022-06-25 17:52:23 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-07-01 06:23:58 -1000 |
| commit | fb9e4559ed1357b65a016a3ddc73144dd7a9326d (patch) | |
| tree | f42955b69d910aafd179aae37a53a30ce47c5f55 | |
| parent | 53eca714b874d2cd323ab6d3e11641fdf746a980 (diff) | |
| download | openembedded-core-contrib-fb9e4559ed1357b65a016a3ddc73144dd7a9326d.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.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3ad994d95815eefed2a72b675c7a323b3ed38191)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes/base.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index bdb3ac33c6..0cf27fbb91 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -596,9 +596,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 = {} |