diff options
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_253.1.bb | 1 |
2 files changed, 0 insertions, 43 deletions
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 @@ | |||
| 1 | From b17826490c1db2051dda23550ebdcd7f10e23479 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Wed, 28 Jun 2023 13:49:41 +0800 | ||
| 4 | Subject: [PATCH 1/2] legacy.conf.in: Don't create symlink README in this file | ||
| 5 | |||
| 6 | Commit 6fe23ff31c0 changed README to an symlink to README.logs, and | ||
| 7 | install README.logs under systemd doc dir. | ||
| 8 | |||
| 9 | But for OE, systemd doc dir is splited into package systemd-doc, when it | ||
| 10 | is not installed on the target, there will be an dead link: | ||
| 11 | Eg: | ||
| 12 | root@intel-x86-64:/var/log# ls -l README | ||
| 13 | lrwxrwxrwx 1 root root 39 Jun 20 08:57 README -> ../../usr/share/doc/systemd/README.logs | ||
| 14 | root@intel-x86-64:/var/log# ls -l ../../usr/share/doc/systemd/README.logs | ||
| 15 | ls: cannot access '../../usr/share/doc/systemd/README.logs': No such file or directory | ||
| 16 | |||
| 17 | So remove this symlink from package systemd | ||
| 18 | |||
| 19 | Upstream-Status: Inappropriate [oe specific] | ||
| 20 | |||
| 21 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 22 | --- | ||
| 23 | tmpfiles.d/legacy.conf.in | 3 --- | ||
| 24 | 1 file changed, 3 deletions(-) | ||
| 25 | |||
| 26 | diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in | ||
| 27 | index 4f2c0d7c43..62e2ae0986 100644 | ||
| 28 | --- a/tmpfiles.d/legacy.conf.in | ||
| 29 | +++ b/tmpfiles.d/legacy.conf.in | ||
| 30 | @@ -12,9 +12,6 @@ | ||
| 31 | |||
| 32 | d /run/lock 0755 root root - | ||
| 33 | L /var/lock - - - - ../run/lock | ||
| 34 | -{% if CREATE_LOG_DIRS %} | ||
| 35 | -L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs | ||
| 36 | -{% endif %} | ||
| 37 | |||
| 38 | # /run/lock/subsys is used for serializing SysV service execution, and | ||
| 39 | # hence without use on SysV-less systems. | ||
| 40 | -- | ||
| 41 | 2.25.1 | ||
| 42 | |||
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 += " \ | |||
| 25 | file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ | 25 | file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ |
| 26 | file://0008-implment-systemd-sysv-install-for-OE.patch \ | 26 | file://0008-implment-systemd-sysv-install-for-OE.patch \ |
| 27 | file://0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ | 27 | file://0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ |
| 28 | file://0001-legacy.conf.in-Don-t-create-symlink-README-in-this-f.patch \ | ||
| 29 | " | 28 | " |
| 30 | 29 | ||
| 31 | # patches needed by musl | 30 | # patches needed by musl |
