diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2022-06-25 17:52:23 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-08 08:27:16 +0100 |
| commit | 20646e140cc926fbe14b17087eeaf551a12230c7 (patch) | |
| tree | 35c43b8701217e94bbe63b1801798e347e3b49ce | |
| parent | ec6149d0002b45ae8a949ae98fda41cb7a9efbc5 (diff) | |
| download | poky-20646e140cc926fbe14b17087eeaf551a12230c7.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: fb9e4559ed1357b65a016a3ddc73144dd7a9326d)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 () { | |||
| 596 | 596 | ||
| 597 | for lic_exception in exceptions: | 597 | for lic_exception in exceptions: |
| 598 | if ":" in lic_exception: | 598 | if ":" in lic_exception: |
| 599 | lic_exception.split(":")[0] | 599 | lic_exception = lic_exception.split(":")[1] |
| 600 | if lic_exception in oe.license.obsolete_license_list(): | 600 | if lic_exception in oe.license.obsolete_license_list(): |
| 601 | bb.fatal("Invalid license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception) | 601 | bb.fatal("Obsolete license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception) |
| 602 | 602 | ||
| 603 | pkgs = d.getVar('PACKAGES').split() | 603 | pkgs = d.getVar('PACKAGES').split() |
| 604 | skipped_pkgs = {} | 604 | skipped_pkgs = {} |
