summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-08-20 14:51:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-21 21:51:49 +0100
commit8dabc4b3c651f7fc55c41c9ae0513b5d0cdd2af9 (patch)
tree9fdf048757f5e94b21178cb333f0c835df640e18
parent0f105ef27ff6dc1147563e0e901834fbe3d89fad (diff)
downloadpoky-8dabc4b3c651f7fc55c41c9ae0513b5d0cdd2af9.tar.gz
rpcbind: upgrade 1.2.6 -> 1.2.7
0001-systemd-use-EnvironmentFile.patch refreshed for 1.2.7 (From OE-Core rev: a6b3254ef229f9e838059bc607bdb51ff6f29966) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch21
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_1.2.7.bb (renamed from meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb)2
2 files changed, 11 insertions, 12 deletions
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..1d7ba7d508 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch
+++ b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch
@@ -9,34 +9,33 @@ Upstream-Status: Inappropriate [OE specific]
9Signed-off-by: Stefan Agner <stefan.agner@toradex.com> 9Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
10--- 10---
11 configure.ac | 2 ++ 11 configure.ac | 2 ++
12 systemd/rpcbind.service.in | 2 +- 12 systemd/rpcbind.service.in | 1 +
13 2 files changed, 3 insertions(+), 1 deletion(-) 13 2 files changed, 3 insertions(+)
14 14
15diff --git a/configure.ac b/configure.ac 15diff --git a/configure.ac b/configure.ac
16index 2dd9471..47a46c0 100644 16index 8f4cef3..4705413 100644
17--- a/configure.ac 17--- a/configure.ac
18+++ b/configure.ac 18+++ b/configure.ac
19@@ -69,5 +69,7 @@ AC_CHECK_HEADERS([nss.h rpcsvc/mount.h]) 19@@ -86,5 +86,7 @@ AC_CHECK_HEADERS([nss.h])
20 # 2 "evals" needed to expand variable names 20 # 2 "evals" needed to expand variable names
21 AC_SUBST([_sbindir]) 21 AC_SUBST([_sbindir])
22 AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir]) 22 AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
23+AC_SUBST([_sysconfdir]) 23+AC_SUBST([_sysconfdir])
24+AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir]) 24+AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir])
25 25
26 AC_OUTPUT([Makefile systemd/rpcbind.service]) 26 AC_OUTPUT([Makefile systemd/rpcbind.service systemd/rpcbind.socket])
27diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in 27diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
28index 7b1c74b..f45ee1e 100644 28index c892ca8..e0511bd 100644
29--- a/systemd/rpcbind.service.in 29--- a/systemd/rpcbind.service.in
30+++ b/systemd/rpcbind.service.in 30+++ b/systemd/rpcbind.service.in
31@@ -11,7 +11,7 @@ Wants=rpcbind.target 31@@ -12,6 +12,7 @@ Wants=rpcbind.target
32
33 [Service] 32 [Service]
34 Type=notify 33 Type=notify
35-# distro can provide a drop-in adding EnvironmentFile=-/??? if needed. 34 # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
36+EnvironmentFile=-@_sysconfdir@/rpcbind.conf 35+EnvironmentFile=-@_sysconfdir@/rpcbind.conf
37 ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f 36 ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f
38 37
39 [Install] 38 [Install]
40-- 39--
412.23.0 402.34.1
42 41
diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb b/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 \
18 file://rpcbind_add_option_to_fix_port_number.patch \ 18 file://rpcbind_add_option_to_fix_port_number.patch \
19 file://0001-systemd-use-EnvironmentFile.patch \ 19 file://0001-systemd-use-EnvironmentFile.patch \
20 " 20 "
21SRC_URI[sha256sum] = "5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de" 21SRC_URI[sha256sum] = "f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e"
22 22
23inherit autotools update-rc.d systemd pkgconfig update-alternatives 23inherit autotools update-rc.d systemd pkgconfig update-alternatives
24 24