diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-12-11 17:48:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-28 11:51:03 +0000 |
commit | 375065fa17b04ff73529911ece02069eaf7a8e71 (patch) | |
tree | 55c04f4eea064c94d44e5474b220b06e8e11e3bc /meta/lib/oeqa/selftest/cases | |
parent | 14227b03a22f1fa59ea2ad2aed56c2469219d542 (diff) | |
download | poky-375065fa17b04ff73529911ece02069eaf7a8e71.tar.gz |
license.bbclass: Introduce AVAILABLE_LICENSES that lists all licenses
Previously, there was SRC_DISTRIBUTE_LICENSES, an undocumented
variable that contained a static list of licenses. It was used by
expand_wildcard_licenses() to expand any wildcards used in, e.g.,
INCOMPATIBLE_LICENSE. However, since this static list of licenses has
not been kept up-to-date, many licenses were missing, with the result
that if one tried to use any of those licenses with a wildcard, no
licenses would be found, effectively ignoring that they should be
marked as incompatible.
This introduces a new (documented) variable, AVAILABLE_LICENSES, that
is automatically updated to contain all licenses found in any
directories specified by ${COMMON_LICENSE_DIR} and ${LICENSE_PATH},
and uses it instead of SRC_DISTRIBUTE_LICENSES when expanding
wildcards.
(From OE-Core rev: 5ed714139f91eb03871e01b68a4370784071234d)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8c9ef587fe499c612a878a1ab42092eb79b334ef)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/cases')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/incompatible_lic.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py index 8fb93af8a8..3cc5bbc35c 100644 --- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py | |||
@@ -12,12 +12,12 @@ class IncompatibleLicenseTests(OESelftestTestCase): | |||
12 | if error_msg not in result.output: | 12 | if error_msg not in result.output: |
13 | raise AssertionError(result.output) | 13 | raise AssertionError(result.output) |
14 | 14 | ||
15 | # Verify that a package with an SPDX license (from SRC_DISTRIBUTE_LICENSES) | 15 | # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) |
16 | # cannot be built when INCOMPATIBLE_LICENSE contains this SPDX license | 16 | # cannot be built when INCOMPATIBLE_LICENSE contains this SPDX license |
17 | def test_incompatible_spdx_license(self): | 17 | def test_incompatible_spdx_license(self): |
18 | self.lic_test('incompatible-license', 'GPL-3.0', 'GPL-3.0') | 18 | self.lic_test('incompatible-license', 'GPL-3.0', 'GPL-3.0') |
19 | 19 | ||
20 | # Verify that a package with an SPDX license (from SRC_DISTRIBUTE_LICENSES) | 20 | # Verify that a package with an SPDX license (from AVAILABLE_LICENSES) |
21 | # cannot be built when INCOMPATIBLE_LICENSE contains an alias (in | 21 | # cannot be built when INCOMPATIBLE_LICENSE contains an alias (in |
22 | # SPDXLICENSEMAP) of this SPDX license | 22 | # SPDXLICENSEMAP) of this SPDX license |
23 | def test_incompatible_alias_spdx_license(self): | 23 | def test_incompatible_alias_spdx_license(self): |
@@ -35,7 +35,7 @@ class IncompatibleLicenseTests(OESelftestTestCase): | |||
35 | self.lic_test('incompatible-license-alias', 'GPLv3', 'GPLv3') | 35 | self.lic_test('incompatible-license-alias', 'GPLv3', 'GPLv3') |
36 | 36 | ||
37 | # Verify that a package with a non-SPDX license (neither in | 37 | # Verify that a package with a non-SPDX license (neither in |
38 | # SRC_DISTRIBUTE_LICENSES nor in SPDXLICENSEMAP) cannot be built when | 38 | # AVAILABLE_LICENSES nor in SPDXLICENSEMAP) cannot be built when |
39 | # INCOMPATIBLE_LICENSE contains this license | 39 | # INCOMPATIBLE_LICENSE contains this license |
40 | def test_incompatible_nonspdx_license(self): | 40 | def test_incompatible_nonspdx_license(self): |
41 | self.lic_test('incompatible-nonspdx-license', 'FooLicense', 'FooLicense') | 41 | self.lic_test('incompatible-nonspdx-license', 'FooLicense', 'FooLicense') |