From bf072d6b3b34b219b7f985bd3456be77ed6f03b5 Mon Sep 17 00:00:00 2001 From: Pinghao Wu Date: Thu, 15 Feb 2024 13:41:39 +0800 Subject: [PATCH] systemd: fix path --- ...lpine-path-util-support-pre-usrmerge.patch | 27 +++++++++++++++++++ systemd/APKBUILD | 6 +++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 systemd/0104-DNM-alpine-path-util-support-pre-usrmerge.patch diff --git a/systemd/0104-DNM-alpine-path-util-support-pre-usrmerge.patch b/systemd/0104-DNM-alpine-path-util-support-pre-usrmerge.patch new file mode 100644 index 0000000..d8155a5 --- /dev/null +++ b/systemd/0104-DNM-alpine-path-util-support-pre-usrmerge.patch @@ -0,0 +1,27 @@ +From cffc7b910d4c8688567add8939dd496ab63ccecf Mon Sep 17 00:00:00 2001 +From: Pinghao Wu +Date: Thu, 15 Feb 2024 13:39:02 +0800 +Subject: [PATCH] [DNM][alpine] path-util: support pre-usrmerge + +--- + src/basic/path-util.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/basic/path-util.h b/src/basic/path-util.h +index 6d943e9..90cc4f4 100644 +--- a/src/basic/path-util.h ++++ b/src/basic/path-util.h +@@ -25,8 +25,8 @@ + # define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x) + #endif + +-#define DEFAULT_PATH PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") +-#define DEFAULT_PATH_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/") ++#define DEFAULT_PATH PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") ":" PATH_SBIN_BIN("/") ++#define DEFAULT_PATH_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/") PATH_SBIN_BIN_NULSTR("/") + #define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/") + + #ifndef DEFAULT_USER_PATH +-- +2.43.0 + diff --git a/systemd/APKBUILD b/systemd/APKBUILD index f8f6545..aaf84aa 100644 --- a/systemd/APKBUILD +++ b/systemd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: xdavidwu pkgname=systemd pkgver=255.3 -pkgrel=2 +pkgrel=3 pkgdesc="System and Service Manager" url="https://www.github.com/systemd/systemd" arch="all" @@ -41,7 +41,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/systemd/systemd-stable/archi 0100-Do-not-buffer-on-systemd-sleep.patch 0101-efi-do-not-set-wide-exec-charset.patch 0102-efi-hack-out-musl-wchar-definition.patch - 0103-meson-lintl-for-musl-gettext.patch" + 0103-meson-lintl-for-musl-gettext.patch + 0104-DNM-alpine-path-util-support-pre-usrmerge.patch" pkgusers="systemd-network systemd-resolve systemd-coredump" pkggroups="systemd-journal" provides="hwids-udev=99999999 eudev=99 eudev-libs=99" @@ -152,4 +153,5 @@ d2ab37ed91af87b70f18ff1f05c9959f20cfafe78e1d49f18a522d41ce4a8ed1c2851826fad1c4f5 4ea51f1b47140ee79d738fa983c42402ed0bb4c5ae79880fd30555c7571b5e0a4e7e86457be987bfdf0da928a1111a54709ed54a6676305e5036920347adb5cd 0101-efi-do-not-set-wide-exec-charset.patch ab3075a07010708fa795a9ff2a0f08f9a0a317034479e41bc8948c0d24155087b797b832e13dc6f534151600dbe5ad4526e9a48eec0328fc00c6609a8328aee7 0102-efi-hack-out-musl-wchar-definition.patch ec8feed6259e52874ff8c3019746a6c40d38cc4b5a775d934161c51515f435768baad7d87315ecf8192266d2a5e096137a73c8bbe2f8f88b6844e53c276cfdd1 0103-meson-lintl-for-musl-gettext.patch +3a489e3d79590b8a8c9fc523602b7cf2e90c0f221b0d97ea51fceb071d8fd66fca3e93764ff6b0cba0a21528b3252a81f10a01e017d6529a6255f6e1c31fffc9 0104-DNM-alpine-path-util-support-pre-usrmerge.patch " -- 2.43.0