diff options
-rw-r--r-- | meta/classes-global/insane.bbclass | 2 | ||||
-rw-r--r-- | meta/classes-recipe/license_image.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/incompatible_lic.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index 04eb88364e..6a84c4aa74 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass | |||
@@ -34,7 +34,7 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ | |||
34 | mime mime-xdg unlisted-pkg-lics unhandled-features-check \ | 34 | mime mime-xdg unlisted-pkg-lics unhandled-features-check \ |
35 | missing-update-alternatives missing-ptest \ | 35 | missing-update-alternatives missing-ptest \ |
36 | license-exists license-no-generic license-syntax license-format \ | 36 | license-exists license-no-generic license-syntax license-format \ |
37 | license-incompatible license-file-missing obsolete-license \ | 37 | license-exception license-file-missing obsolete-license \ |
38 | libdir xorg-driver-abi buildpaths \ | 38 | libdir xorg-driver-abi buildpaths \ |
39 | dep-cmp pkgvarcheck perm-config perm-line perm-link \ | 39 | dep-cmp pkgvarcheck perm-config perm-line perm-link \ |
40 | packages-list pkgv-undefined var-undefined \ | 40 | packages-list pkgv-undefined var-undefined \ |
diff --git a/meta/classes-recipe/license_image.bbclass b/meta/classes-recipe/license_image.bbclass index 19b3dc55ba..0e953856a6 100644 --- a/meta/classes-recipe/license_image.bbclass +++ b/meta/classes-recipe/license_image.bbclass | |||
@@ -72,7 +72,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): | |||
72 | else: | 72 | else: |
73 | incompatible_licenses = incompatible_pkg_license(d, bad_licenses, pkg_dic[pkg]["LICENSE"]) | 73 | incompatible_licenses = incompatible_pkg_license(d, bad_licenses, pkg_dic[pkg]["LICENSE"]) |
74 | if incompatible_licenses: | 74 | if incompatible_licenses: |
75 | oe.qa.handle_error('license-incompatible', "Including %s with incompatible license(s) %s into the image, because it has been allowed by exception list." %(pkg, ' '.join(incompatible_licenses)), d) | 75 | oe.qa.handle_error('license-exception', "Including %s with incompatible license(s) %s into the image, because it has been allowed by exception list." %(pkg, ' '.join(incompatible_licenses)), d) |
76 | try: | 76 | try: |
77 | (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \ | 77 | (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \ |
78 | oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"], | 78 | oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"], |
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py index 4c228de6a3..439c1b9f0e 100644 --- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py | |||
@@ -128,7 +128,7 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0* LGPL-3.0*" | |||
128 | bitbake('core-image-minimal') | 128 | bitbake('core-image-minimal') |
129 | 129 | ||
130 | def test_bash_license_exceptions(self): | 130 | def test_bash_license_exceptions(self): |
131 | self.write_config(self.default_config() + '\nINCOMPATIBLE_LICENSE_EXCEPTIONS:pn-core-image-minimal = "bash:GPL-3.0-or-later"\nERROR_QA:remove = "license-incompatible"') | 131 | self.write_config(self.default_config() + '\nINCOMPATIBLE_LICENSE_EXCEPTIONS:pn-core-image-minimal = "bash:GPL-3.0-or-later"\nERROR_QA:remove = "license-exception"') |
132 | 132 | ||
133 | bitbake('core-image-minimal') | 133 | bitbake('core-image-minimal') |
134 | 134 | ||