Please drop this patch which has been upgraded in master recently //Hongxu ________________________________ From: [email protected] <[email protected]> on behalf of hongxu <[email protected]> Sent: Friday, August 23, 2024 9:48 AM To: [email protected] <[email protected]> Subject: [OE-core] [poky][PATCH 5/9] rpcbind: 1.2.6 -> 1.2.7
Rebase 0001-systemd-use-EnvironmentFile.patch to 1.2.7 Signed-off-by: Hongxu Jia <[email protected]> --- .../0001-systemd-use-EnvironmentFile.patch | 30 ++++++++++--------- .../{rpcbind_1.2.6.bb => rpcbind_1.2.7.bb} | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) rename meta/recipes-extended/rpcbind/{rpcbind_1.2.6.bb => rpcbind_1.2.7.bb} (96%) diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch index 79dc96050e..87f6133879 100644 --- a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch +++ b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch @@ -1,42 +1,44 @@ -From da528d5d60137f13202102b53cf178aba45849a5 Mon Sep 17 00:00:00 2001 -From: Stefan Agner <[email protected]> -Date: Sun, 6 Oct 2019 00:05:54 +0200 +From aca8799a29c2a94ab596b5629a4d16f4e6d5692c Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <[email protected]> +Date: Thu, 22 Aug 2024 12:55:52 +0800 Subject: [PATCH] systemd: use EnvironmentFile Use OE specific environment file. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Stefan Agner <[email protected]> + +Rebase to 1.2.7 +Signed-off-by: Hongxu Jia <[email protected]> --- configure.ac | 2 ++ - systemd/rpcbind.service.in | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) + systemd/rpcbind.service.in | 1 + + 2 files changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac -index 2dd9471..47a46c0 100644 +index 8f4cef3..4705413 100644 --- a/configure.ac +++ b/configure.ac -@@ -69,5 +69,7 @@ AC_CHECK_HEADERS([nss.h rpcsvc/mount.h]) +@@ -86,5 +86,7 @@ AC_CHECK_HEADERS([nss.h]) # 2 "evals" needed to expand variable names AC_SUBST([_sbindir]) AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir]) +AC_SUBST([_sysconfdir]) +AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) - AC_OUTPUT([Makefile systemd/rpcbind.service]) + AC_OUTPUT([Makefile systemd/rpcbind.service systemd/rpcbind.socket]) diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in -index 7b1c74b..f45ee1e 100644 +index c892ca8..e0511bd 100644 --- a/systemd/rpcbind.service.in +++ b/systemd/rpcbind.service.in -@@ -11,7 +11,7 @@ Wants=rpcbind.target - +@@ -12,6 +12,7 @@ Wants=rpcbind.target [Service] Type=notify --# distro can provide a drop-in adding EnvironmentFile=-/??? if needed. + # distro can provide a drop-in adding EnvironmentFile=-/??? if needed. +EnvironmentFile=-@_sysconfdir@/rpcbind.conf - ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f + ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f [Install] -- -2.23.0 +2.27.0 diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb similarity index 96% rename from meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb rename to meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb index aeca86e564..d308071d29 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb @@ -18,7 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ file://rpcbind_add_option_to_fix_port_number.patch \ file://0001-systemd-use-EnvironmentFile.patch \ " -SRC_URI[sha256sum] = "5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de" +SRC_URI[sha256sum] = "f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e" inherit autotools update-rc.d systemd pkgconfig update-alternatives -- 2.27.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#203677): https://lists.openembedded.org/g/openembedded-core/message/203677 Mute This Topic: https://lists.openembedded.org/mt/108049812/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
