diff options
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/license.py | 5 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/incompatible_lic.py | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py index 8955cbdeb2..29412dfe46 100644 --- a/meta/lib/oe/license.py +++ b/meta/lib/oe/license.py | |||
@@ -242,3 +242,8 @@ def list_licenses(licensestr): | |||
242 | except SyntaxError as exc: | 242 | except SyntaxError as exc: |
243 | raise LicenseSyntaxError(licensestr, exc) | 243 | raise LicenseSyntaxError(licensestr, exc) |
244 | return visitor.licenses | 244 | return visitor.licenses |
245 | |||
246 | def apply_pkg_license_exception(pkg, bad_licenses, exceptions): | ||
247 | """Return remaining bad licenses after removing any package exceptions""" | ||
248 | |||
249 | return [lic for lic in bad_licenses if pkg + ':' + lic not in exceptions] | ||
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py index fd3b3f409e..c68f920555 100644 --- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py | |||
@@ -110,8 +110,8 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0 LGPL-3.0" | |||
110 | 110 | ||
111 | bitbake('core-image-minimal') | 111 | bitbake('core-image-minimal') |
112 | 112 | ||
113 | def test_bash_whitelist(self): | 113 | def test_bash_license_exceptions(self): |
114 | self.write_config(self.default_config() + '\nWHITELIST_GPL-3.0:pn-core-image-minimal = "bash"') | 114 | self.write_config(self.default_config() + '\nINCOMPATIBLE_LICENSE_EXCEPTIONS:pn-core-image-minimal = "bash:GPL-3.0-or-later"') |
115 | 115 | ||
116 | bitbake('core-image-minimal') | 116 | bitbake('core-image-minimal') |
117 | 117 | ||