From 9cbafd65b0fbcab1a67e87b96ab88b84e1e65f48 Mon Sep 17 00:00:00 2001 From: Steve Sakoman Date: Wed, 5 Jul 2023 08:47:28 -1000 Subject: Revert "systemd: fix a dead link under /var/log" Needs to go to master branch before stable branches. This reverts commit 7702dc8fc6c9b34647067ffabbc0e24d6109abe7. (From OE-Core rev: ac4c9f5aa967507d028caa3ee70f3fce580f9a09) Signed-off-by: Steve Sakoman --- ....in-Don-t-create-symlink-README-in-this-f.patch | 42 ---------------------- meta/recipes-core/systemd/systemd_253.1.bb | 1 - 2 files changed, 43 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch diff --git a/meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch b/meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch deleted file mode 100644 index a2644bba8e..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b17826490c1db2051dda23550ebdcd7f10e23479 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Wed, 28 Jun 2023 13:49:41 +0800 -Subject: [PATCH 1/2] legacy.conf.in: Don't create symlink README in this file - -Commit 6fe23ff31c0 changed README to an symlink to README.logs, and -install README.logs under systemd doc dir. - -But for OE, systemd doc dir is splited into package systemd-doc, when it -is not installed on the target, there will be an dead link: -Eg: -root@intel-x86-64:/var/log# ls -l README -lrwxrwxrwx 1 root root 39 Jun 20 08:57 README -> ../../usr/share/doc/systemd/README.logs -root@intel-x86-64:/var/log# ls -l ../../usr/share/doc/systemd/README.logs -ls: cannot access '../../usr/share/doc/systemd/README.logs': No such file or directory - -So remove this symlink from package systemd - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Changqing Li ---- - 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 4f2c0d7c43..62e2ae0986 100644 ---- a/tmpfiles.d/legacy.conf.in -+++ b/tmpfiles.d/legacy.conf.in -@@ -12,9 +12,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 %} - - # /run/lock/subsys is used for serializing SysV service execution, and - # hence without use on SysV-less systems. --- -2.25.1 - diff --git a/meta/recipes-core/systemd/systemd_253.1.bb b/meta/recipes-core/systemd/systemd_253.1.bb index 59a0ab757f..f306765168 100644 --- a/meta/recipes-core/systemd/systemd_253.1.bb +++ b/meta/recipes-core/systemd/systemd_253.1.bb @@ -25,7 +25,6 @@ SRC_URI += " \ file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0008-implment-systemd-sysv-install-for-OE.patch \ file://0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ - file://0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch \ " # patches needed by musl -- cgit v1.2.3-54-g00ecf