On Mon, 2021-11-08 at 18:10 +0100, Peter Kjellerstedt wrote: > From: Peter Kjellerstedt <peter.kjellerst...@axis.com> > > The empty-dirs QA check verifies that all directories specified in > QA_EMPTY_DIRS are empty. It is possible to specify why a directory is > expected to be empty by defining QA_EMPTY_DIRS_RECOMMENDATION:<path>, > which will then be included in the error message if the directory is > not empty. If it is not specified for a directory, then "but it is > expected to be empty" will be used. > > Change-Id: Ic61019528f4b22f26e42e78125a99666ae27c7f5 > Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com> > --- > > Compared to the corresponding patch for master, there are two > differences: > > * "/var/volatile" is not added to QA_EMPTY_DIRS by default. > * "empty-dirs" is added to WARN_QA instead of ERROR_QA. > > This should make it safe to add this QA test to Honister without > introdusing any new QA errors, while still allowing the QA test to be > activated for those who wants to use it.
Does it have to be enabled by default? Thanks, Anuj > > meta/classes/insane.bbclass | 32 +++++++++++++++++++++++++++++++- > meta/conf/documentation.conf | 2 ++ > 2 files changed, 33 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/insane.bbclass > b/meta/classes/insane.bbclass > index f2d2ca3689..7d4ba28e40 100644 > --- a/meta/classes/insane.bbclass > +++ b/meta/classes/insane.bbclass > @@ -27,7 +27,7 @@ WARN_QA ?= " libdir xorg-driver-abi \ > infodir build-deps src-uri-bad symlink-to-sysroot > multilib \ > invalid-packageconfig host-user-contaminated uppercase- > pn patch-fuzz \ > mime mime-xdg unlisted-pkg-lics unhandled-features-check > \ > - missing-update-alternatives native-last missing-ptest \ > + missing-update-alternatives native-last missing-ptest > empty-dirs \ > " > ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig > la \ > perms dep-cmp pkgvarcheck perm-config perm-line perm- > link \ > @@ -50,6 +50,20 @@ ALL_QA = "${WARN_QA} ${ERROR_QA}" > > UNKNOWN_CONFIGURE_WHITELIST ?= "--enable-nls --disable-nls -- > disable-silent-rules --disable-dependency-tracking --with-libtool- > sysroot --disable-static" > > +# This is a list of directories that are expected to be empty. > +QA_EMPTY_DIRS ?= " \ > + /dev/pts \ > + /media \ > + /proc \ > + /run \ > + /tmp \ > + ${localstatedir}/run \ > +" > +# It is possible to specify why a directory is expected to be empty > by defining > +# QA_EMPTY_DIRS_RECOMMENDATION:<path>, which will then be included > in the error > +# message if the directory is not empty. If it is not specified for > a directory, > +# then "but it is expected to be empty" will be used. > + > def package_qa_clean_path(path, d, pkg=None): > """ > Remove redundant paths from the path for display. If pkg isn't > set then > @@ -917,6 +931,22 @@ def package_qa_check_unlisted_pkg_lics(package, > d, messages): > "listed in LICENSE" % (package, ' > '.join(unlisted))) > return False > > +QAPKGTEST[empty-dirs] = "package_qa_check_empty_dirs" > +def package_qa_check_empty_dirs(pkg, d, messages): > + """ > + Check for the existence of files in directories that are > expected to be > + empty. > + """ > + > + pkgd = oe.path.join(d.getVar('PKGDEST'), pkg) > + for dir in (d.getVar('QA_EMPTY_DIRS') or "").split(): > + empty_dir = oe.path.join(pkgd, dir) > + if os.path.exists(empty_dir) and os.listdir(empty_dir): > + recommendation = > (d.getVar('QA_EMPTY_DIRS_RECOMMENDATION:' + dir) or > + "but it is expected to be empty") > + msg = "%s installs files in %s, %s" % (pkg, dir, > recommendation) > + oe.qa.add_message(messages, "empty-dirs", msg) > + > def package_qa_check_encoding(keys, encode, d): > def check_encoding(key, enc): > sane = True > diff --git a/meta/conf/documentation.conf > b/meta/conf/documentation.conf > index c5a38b0764..d38a88fb49 100644 > --- a/meta/conf/documentation.conf > +++ b/meta/conf/documentation.conf > @@ -345,6 +345,8 @@ PYPI_SRC_URI[doc] = "The URI to use to fetch from > pypi, default uses pythonhoste > > #Q > > +QA_EMPTY_DIRS[doc] = "A list of directories that are expected to be > empty." > +QA_EMPTY_DIRS_RECOMMENDATION[doc] = "This specifies a recommendation > for a directory why it must be empty, which will be included in the > error message if the directory is not empty." > QMAKE_PROFILES[doc] = "Specifies your own subset of .pro files to be > built for use with qmake." > > #R > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158020): https://lists.openembedded.org/g/openembedded-core/message/158020 Mute This Topic: https://lists.openembedded.org/mt/86910911/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-