systemd: Do not install anything in /var/volatile
PATCH v2 1/2 systemd: Do not install anything in /var/volatile
/var/log is typically a symbolic link to inside /var/volatile, which is expected to be empty. Check ${VOLATILE_LOG_DIR} to see if it is ok to install /var/log.
---
PATCHv2: Added check for ${VOLATILE_LOG_DIR} before removing /var/log.
meta/recipes-core/systemd/systemd_249.5.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
meta/recipes-core/systemd/systemd_249.5.bb +9 -6
@@ -270,13 +270,16 @@ do_install() { install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_system_unitdir}d-sysv-install fi - chown root:systemd-journal ${D}/${localstatedir}/log/journal - - # Delete journal README, as log can be symlinked inside volatile. - rm -f ${D}/${localstatedir}/log/README + if "${@'true' if oe.types.boolean(d.getVar('VOLATILE_LOG_DIR')) else 'false'}"; then + # /var/log is typically a symbolic link to inside /var/volatile, + # which is expected to be empty. + rm -rf ${D}${localstatedir}/log + else + chown root:systemd-journal ${D}${localstatedir}/log/journal - # journal-remote creates this at start - rm -rf ${D}/${localstatedir}/log/journal/remote + # journal-remote creates this at start + rm -rf ${D}${localstatedir}/log/journal/remote + fi install -d ${D}${systemd_system_unitdir}/graphical.target.wants install -d ${D}${systemd_system_unitdir}/multi-user.target.wants
PATCH v2 2/2 insane.bbclass: Add a check for directories that are expected to be empty
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.
---
PATCHv2: No changes.
meta/classes/insane.bbclass | 33 ++++++++++++++++++++++++++++++++- meta/conf/documentation.conf | 2 ++ 2 files changed, 34 insertions(+), 1 deletion(-)
meta/classes/insane.bbclass +32 -1
@@ -37,7 +37,7 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ configure-gettext perllocalpod shebang-size \ already-stripped installed-vs-shipped ldflags compile-host-path \ install-host-path pn-overrides unknown-configure-option \ - useless-rpaths rpaths staticdev \ + useless-rpaths rpaths staticdev empty-dirs \ " # Add usrmerge QA check based on distro feature ERROR_QA:append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}"
@@ -50,6 +50,21 @@ 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 \ + ${localstatedir}/volatile \ +" +# 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
@@ -885,6 +900,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
meta/conf/documentation.conf +2 -0
@@ -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
Re: [OE-core] [PATCHv2 2/2] insane.bbclass: Add a check for directories that are expected to be empty
Quoted 56 lines · Peter Kjellerstedt
The empty-dirs QA check verifies that all directories specified in
QA_EMPTY_DIRSare 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.Signed-off-by Peter Kjellerstedt <[email protected]>---
PATCHv2: No changes.
meta/classes/insane.bbclass | 33 ++++++++++++++++++++++++++++++++-
meta/conf/documentation.conf| 2 ++2 files changed, 34 insertions(+), 1 deletion(-)meta/classes/insane.bbclass +0
-0@@ -37,7 +37,7 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ configure-gettext perllocalpod shebang-size \already-stripped installed-vs-shipped ldflags compile- host-path \
install-host-path pn-overrides unknown-configure-option \
- useless-rpaths rpaths staticdev \
+ useless-rpaths rpaths staticdev empty-dirs \
"
# Add usrmerge QA check based on distro feature ERROR_QA:append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}"meta/classes/insane.bbclass +0
-0@@ -50,6 +50,21 @@ ALL_QA = "${WARN_QA} ${ERROR_QA}"
UNKNOWN_CONFIGURE_WHITELIST ?= "--enable-nls --disable-nls -- disable-silent-rules --disable-dependency-tracking --with-libtool- sysroot --disable-static"meta/classes/insane.bbclass +11
-0+# This is a list of directories that are expected to be empty. +QA_EMPTY_DIRS ?= " \ + /dev/pts \ + /media \ + /proc \ + /run \ + /tmp \ + ${localstatedir}/run \ + ${localstatedir}/volatile \ +" +# It is possible to specify why a directory is expected to be emptyby 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,
meta/classes/insane.bbclass ALL_QA = "${WARN_QA} ${ERROR_QA}" · line 67
Quoted 2 lines
meta/classes/insane.bbclass +2
-0+# then "but it is expected to be empty" will be used. +
One thing I've just noticed is that this is more strictly limited to ensuring certain directories are empty, rather than ensuring certain paths (which may include the existance of an empty directory or a file). Could this be modified to allow wildcard entries, as with the proposal I originally submitted?
Quoted 63 lines
def
package_qa_clean_path(path, d, pkg=None):
"""
Remove redundant paths from the path for display. If pkg isn't set thenmeta/classes/insane.bbclass +0
-0@@ -885,6 +900,22 @@ def package_qa_check_unlisted_pkg_lics(package,d, messages):
"listed in LICENSE" % (package, ' '.join(unlisted)))
return Falsemeta/classes/insane.bbclass +4
-0+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 areexpected 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)
+ ifos.path.exists(empty_dir)andos.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)+
defpackage_qa_check_encoding(keys, encode, d):
defcheck_encoding(key, enc):
sane = Truemeta/conf/documentation.conf +0
-0@@ -345,6 +345,8 @@ PYPI_SRC_URI[doc] = "The URI to use to fetch frompypi, 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 (#157564):
https://lists.openembedded.org/g/openembedded-core/message/157564
Mute This Topic: https://lists.openembedded.org/mt/86634477/6512429
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core] [PATCHv2 2/2] insane.bbclass: Add a check for directories that are expected to be empty
Quoted 57 lines · Martyn Welch
Quoted 56 lines · Peter Kjellerstedt
The empty-dirs QA check verifies that all directories specified in
QA_EMPTY_DIRSare 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.Signed-off-by Peter Kjellerstedt <[email protected]>---
PATCHv2: No changes.
meta/classes/insane.bbclass | 33 ++++++++++++++++++++++++++++++++-
meta/conf/documentation.conf| 2 ++2 files changed, 34 insertions(+), 1 deletion(-)meta/classes/insane.bbclass +0
-0@@ -37,7 +37,7 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ configure-gettext perllocalpod shebang-size \already-stripped installed-vs-shipped ldflags compile- host-path \
install-host-path pn-overrides unknown-configure-option \
- useless-rpaths rpaths staticdev \
+ useless-rpaths rpaths staticdev empty-dirs \
"
# Add usrmerge QA check based on distro feature ERROR_QA:append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}"meta/classes/insane.bbclass +0
-0@@ -50,6 +50,21 @@ ALL_QA = "${WARN_QA} ${ERROR_QA}"
UNKNOWN_CONFIGURE_WHITELIST ?= "--enable-nls --disable-nls -- disable-silent-rules --disable-dependency-tracking --with-libtool- sysroot --disable-static"meta/classes/insane.bbclass +11
-0+# This is a list of directories that are expected to be empty. +QA_EMPTY_DIRS ?= " \ + /dev/pts \ + /media \ + /proc \ + /run \ + /tmp \ + ${localstatedir}/run \ + ${localstatedir}/volatile \ +" +# It is possible to specify why a directory is expected to be emptyby 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,
Quoted 9 lines
meta/classes/insane.bbclass ALL_QA = "${WARN_QA} ${ERROR_QA}" · line 67
Quoted 2 lines
meta/classes/insane.bbclass +2
-0+# then "but it is expected to be empty" will be used. +One thing I've just noticed is that this is more strictly limited to ensuring certain directories are empty, rather than ensuring certain paths (which may include the existance of an empty directory or a file). Could this be modified to allow wildcard entries, as with the proposal I originally submitted?
Hmm, actually, this would probably really complicate the QA_EMPTY_DIRS_RECOMMENDATION functionality and it looks like we really only check for empty directories, so:
Quoted 67 lines
Quoted 43 lines
def
package_qa_clean_path(path, d, pkg=None):
"""
Remove redundant paths from the path for display. If pkg isn't set thenmeta/classes/insane.bbclass +0
-0@@ -885,6 +900,22 @@ def package_qa_check_unlisted_pkg_lics(package,d, messages):
"listed in LICENSE" % (package, ' '.join(unlisted)))
return Falsemeta/classes/insane.bbclass +4
-0+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 areexpected 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)
+ ifos.path.exists(empty_dir)andos.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)+
defpackage_qa_check_encoding(keys, encode, d):
defcheck_encoding(key, enc):
sane = Truemeta/conf/documentation.conf +0
-0@@ -345,6 +345,8 @@ PYPI_SRC_URI[doc] = "The URI to use to fetch frompypi, default uses pythonhoste
#Q
+QA_EMPTY_DIRS[doc] = "A list of directories that are expected to beQuoted 11 lines
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 (#157579):
https://lists.openembedded.org/g/openembedded-core/message/157579
Mute This Topic: https://lists.openembedded.org/mt/86634477/6512429
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]
]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCHv2 2/2] insane.bbclass: Add a check for directories that are expected to be empty
In reply to Peter KjellerstedtHi Peter,
This seems to fail on the AB:
https://autobuilder.yoctoproject.org/typhoon/#/builders/15/builds/4544/steps/11/logs/stdio
The same failure is seen in other builds too.
Quoted 97 lines · Peter Kjellerstedt
The empty-dirs QA check verifies that all directories specified in
QA_EMPTY_DIRSare 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.Signed-off-by Peter Kjellerstedt <[email protected]>---
PATCHv2: No changes.
meta/classes/insane.bbclass | 33 ++++++++++++++++++++++++++++++++- meta/conf/documentation.conf | 2 ++ 2 files changed, 34 insertions(+), 1 deletion(-)meta/classes/insane.bbclass +32
-1@@ -37,7 +37,7 @@ ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ configure-gettext perllocalpod shebang-size \ already-stripped installed-vs-shipped ldflags compile-host-path \ install-host-path pn-overrides unknown-configure-option \ - useless-rpaths rpaths staticdev \ + useless-rpaths rpaths staticdev empty-dirs \ " # Add usrmerge QA check based on distro feature ERROR_QA:append = "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', ' usrmerge', '', d)}"@@ -50,6 +50,21 @@ 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 \ + ${localstatedir}/volatile \ +" +# 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@@ -885,6 +900,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 = Truemeta/conf/documentation.conf +2
-1@@ -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 (#157564): https://lists.openembedded.org/g/openembedded-core/message/157564
Mute This Topic: https://lists.openembedded.org/mt/86634477/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com