From 76cf5994262f9fd76cf27e111eb67ad1645541f1 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 21 Jan 2025 06:18:12 +0100 Subject: [PATCH] systemd: Remove /var/log/README using a patch Commit f82d9c997ba (systemd: enable create-log-dirs) removed the creation of the /var/log/README symbolic link by using sed. However, the update to 257 changed the target line and the sed expression no longer matches. Rather than correcting the sed expression, use a patch to remove /var/log/README so that any future changes do not go unnoticed. Signed-off-by: Peter Kjellerstedt Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Ross Burton --- .../0001-Do-not-create-var-log-README.patch | 30 +++++++++++++++++++ meta/recipes-core/systemd/systemd_257.1.bb | 5 +--- 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-core/systemd/systemd/0001-Do-not-create-var-log-README.patch diff --git a/meta/recipes-core/systemd/systemd/0001-Do-not-create-var-log-README.patch b/meta/recipes-core/systemd/systemd/0001-Do-not-create-var-log-README.patch new file mode 100644 index 00000000000..850e356b2fe --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Do-not-create-var-log-README.patch @@ -0,0 +1,30 @@ +From 425ad51e727058b48dd4580fd6afe7e51e96a28a Mon Sep 17 00:00:00 2001 +From: Peter Kjellerstedt +Date: Tue, 21 Jan 2025 05:02:00 +0100 +Subject: [PATCH] Do not create /var/log/README + +/var/log/README is a link to /usr/share/doc/systemd/README.logs. The +latter is packaged in systemd-doc and likely not installed, which leaves +/var/log/README as a dead link. Since /var/log/README is not very +useful, just remove it. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Peter Kjellerstedt +--- + tmpfiles.d/legacy.conf.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in +index b475500e58..650c91a8da 100644 +--- a/tmpfiles.d/legacy.conf.in ++++ b/tmpfiles.d/legacy.conf.in +@@ -13,9 +13,6 @@ + + d /run/lock 0755 root root - + L /var/lock - - - - ../run/lock +-{% if CREATE_LOG_DIRS %} +-L$ /var/log/README - - - - ../..{{DOC_DIR}}/README.logs +-{% endif %} + + {% if HAVE_SYSV_COMPAT %} + # /run/lock/subsys is used for serializing SysV service execution, and diff --git a/meta/recipes-core/systemd/systemd_257.1.bb b/meta/recipes-core/systemd/systemd_257.1.bb index e7dae83957d..cdf72a50157 100644 --- a/meta/recipes-core/systemd/systemd_257.1.bb +++ b/meta/recipes-core/systemd/systemd_257.1.bb @@ -28,6 +28,7 @@ SRC_URI += " \ file://systemd-pager.sh \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0002-implment-systemd-sysv-install-for-OE.patch \ + file://0001-Do-not-create-var-log-README.patch \ " # patches needed by musl @@ -405,10 +406,6 @@ do_install() { # Actively disable Predictable Network Interface Names sed -i 's/^NamePolicy=.*/NamePolicy=/;s/^AlternativeNamesPolicy=.*/AlternativeNamesPolicy=/' ${D}${nonarch_libdir}/systemd/network/99-default.link fi - - if [ -e ${D}${nonarch_libdir}/tmpfiles.d/legacy.conf ];then - sed -i -e '/^L \/var\/log\/README/d' ${D}${nonarch_libdir}/tmpfiles.d/legacy.conf - fi } python populate_packages:prepend (){ -- 2.47.3