Hi all, Gentle ping. Don't forget the doc patch (I messed up and send it in its own "patchseries").
Thanks, Quentin On Mon, Apr 20, 2020 at 10:13:29PM +0200, Quentin Schulz wrote: > Yocto bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=10130 > > Move logic checking that all packages licenses are only a subset of > recipe licenses from base.bbclass to the insane.bbclass so that it's > evaluated only once, during do_package_qa. > > As explained in the linked bugzilla entry, if a package license is not > part of the recipe license, the warning message gets shown an > unreasonable amount of time because it's evaluated every time a recipe > is parsed. > > This also makes it possible to silence this error with INSANE_SKIP. > > Signed-off-by: Quentin Schulz <quentin.sch...@streamunlimited.com> > --- > > v2: > - move code from package class to insane class > > meta/classes/base.bbclass | 13 ------------- > 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 () { > bb.debug(1, "Skipping recipe %s because of > incompatible license(s): %s" % (pn, ' '.join(incompatible_lic))) > raise bb.parse.SkipRecipe("it has incompatible > license(s): %s" % ' '.join(incompatible_lic)) > > - # Try to verify per-package (LICENSE_<pkg>) values. LICENSE should > be a > - # superset of all per-package licenses. We do not do advanced > (pattern) > - # matching of license expressions - just check that all license > strings > - # in LICENSE_<pkg> are found in LICENSE. > - license_set = oe.license.list_licenses(license) > - for pkg in d.getVar('PACKAGES').split(): > - pkg_license = d.getVar('LICENSE_' + pkg) > - if pkg_license: > - unlisted = oe.license.list_licenses(pkg_license) - > license_set > - if unlisted: > - bb.warn("LICENSE_%s includes licenses (%s) that are not " > - "listed in LICENSE" % (pkg, ' '.join(unlisted))) > - > needsrcrev = False > srcuri = d.getVar('SRC_URI') > for uri in srcuri.split(): > diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass > index 478240fa57..47c51081db 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 \ > pn-overrides infodir build-deps src-uri-bad \ > unknown-configure-option symlink-to-sysroot multilib \ > invalid-packageconfig host-user-contaminated uppercase-pn > patch-fuzz \ > - mime mime-xdg \ > + mime mime-xdg unlisted-pkg-lics \ > " > ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ > perms dep-cmp pkgvarcheck perm-config perm-line perm-link \ > @@ -874,6 +874,25 @@ def package_qa_check_expanded_d(package, d, messages): > sane = False > return sane > > +QAPKGTEST[unlisted-pkg-lics] = "package_qa_check_unlisted_pkg_lics" > +def package_qa_check_unlisted_pkg_lics(package, d, messages): > + """ > + Check that all licenses for a package are among the licenses for the > recipe. > + """ > + pkg_lics = d.getVar('LICENSE_' + package) > + if not pkg_lics: > + return True > + > + recipe_lics_set = oe.license.list_licenses(d.getVar('LICENSE')) > + unlisted = oe.license.list_licenses(pkg_lics) - recipe_lics_set > + if not unlisted: > + return True > + > + package_qa_add_message(messages, "unlisted-pkg-lics", > + "LICENSE_%s includes licenses (%s) that are not " > + "listed in LICENSE" % (package, ' > '.join(unlisted))) > + return False > + > def package_qa_check_encoding(keys, encode, d): > def check_encoding(key, enc): > sane = True > -- > 2.17.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#137816): https://lists.openembedded.org/g/openembedded-core/message/137816 Mute This Topic: https://lists.openembedded.org/mt/73158559/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/leave/8023207/1426099254/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
