diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/base.bbclass | 13 | ||||
-rw-r--r-- | meta/classes/insane.bbclass | 21 |
2 files changed, 20 insertions, 14 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 45f9435fd8..7aa2e144eb 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -584,19 +584,6 @@ python () { | |||
584 | bb.debug(1, "Skipping recipe %s because of incompatible license(s): %s" % (pn, ' '.join(incompatible_lic))) | 584 | bb.debug(1, "Skipping recipe %s because of incompatible license(s): %s" % (pn, ' '.join(incompatible_lic))) |
585 | raise bb.parse.SkipRecipe("it has incompatible license(s): %s" % ' '.join(incompatible_lic)) | 585 | raise bb.parse.SkipRecipe("it has incompatible license(s): %s" % ' '.join(incompatible_lic)) |
586 | 586 | ||
587 | # Try to verify per-package (LICENSE_<pkg>) values. LICENSE should be a | ||
588 | # superset of all per-package licenses. We do not do advanced (pattern) | ||
589 | # matching of license expressions - just check that all license strings | ||
590 | # in LICENSE_<pkg> are found in LICENSE. | ||
591 | license_set = oe.license.list_licenses(license) | ||
592 | for pkg in d.getVar('PACKAGES').split(): | ||
593 | pkg_license = d.getVar('LICENSE_' + pkg) | ||
594 | if pkg_license: | ||
595 | unlisted = oe.license.list_licenses(pkg_license) - license_set | ||
596 | if unlisted: | ||
597 | bb.warn("LICENSE_%s includes licenses (%s) that are not " | ||
598 | "listed in LICENSE" % (pkg, ' '.join(unlisted))) | ||
599 | |||
600 | needsrcrev = False | 587 | needsrcrev = False |
601 | srcuri = d.getVar('SRC_URI') | 588 | srcuri = d.getVar('SRC_URI') |
602 | for uri in srcuri.split(): | 589 | for uri in srcuri.split(): |
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 7fc8f33a98..3a0efa3ad6 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -28,7 +28,7 @@ WARN_QA ?= "ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi \ | |||
28 | pn-overrides infodir build-deps src-uri-bad \ | 28 | pn-overrides infodir build-deps src-uri-bad \ |
29 | unknown-configure-option symlink-to-sysroot multilib \ | 29 | unknown-configure-option symlink-to-sysroot multilib \ |
30 | invalid-packageconfig host-user-contaminated uppercase-pn patch-fuzz \ | 30 | invalid-packageconfig host-user-contaminated uppercase-pn patch-fuzz \ |
31 | mime mime-xdg \ | 31 | mime mime-xdg unlisted-pkg-lics \ |
32 | " | 32 | " |
33 | ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ | 33 | ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ |
34 | perms dep-cmp pkgvarcheck perm-config perm-line perm-link \ | 34 | perms dep-cmp pkgvarcheck perm-config perm-line perm-link \ |
@@ -897,6 +897,25 @@ def package_qa_check_expanded_d(package, d, messages): | |||
897 | sane = False | 897 | sane = False |
898 | return sane | 898 | return sane |
899 | 899 | ||
900 | QAPKGTEST[unlisted-pkg-lics] = "package_qa_check_unlisted_pkg_lics" | ||
901 | def package_qa_check_unlisted_pkg_lics(package, d, messages): | ||
902 | """ | ||
903 | Check that all licenses for a package are among the licenses for the recipe. | ||
904 | """ | ||
905 | pkg_lics = d.getVar('LICENSE_' + package) | ||
906 | if not pkg_lics: | ||
907 | return True | ||
908 | |||
909 | recipe_lics_set = oe.license.list_licenses(d.getVar('LICENSE')) | ||
910 | unlisted = oe.license.list_licenses(pkg_lics) - recipe_lics_set | ||
911 | if not unlisted: | ||
912 | return True | ||
913 | |||
914 | package_qa_add_message(messages, "unlisted-pkg-lics", | ||
915 | "LICENSE_%s includes licenses (%s) that are not " | ||
916 | "listed in LICENSE" % (package, ' '.join(unlisted))) | ||
917 | return False | ||
918 | |||
900 | def package_qa_check_encoding(keys, encode, d): | 919 | def package_qa_check_encoding(keys, encode, d): |
901 | def check_encoding(key, enc): | 920 | def check_encoding(key, enc): |
902 | sane = True | 921 | sane = True |