mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
0f105ef27f
commit
8dabc4b3c6
@@ -9,34 +9,33 @@ Upstream-Status: Inappropriate [OE specific]
|
|||||||
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
||||||
---
|
---
|
||||||
configure.ac | 2 ++
|
configure.ac | 2 ++
|
||||||
systemd/rpcbind.service.in | 2 +-
|
systemd/rpcbind.service.in | 1 +
|
||||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
2 files changed, 3 insertions(+)
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 2dd9471..47a46c0 100644
|
index 8f4cef3..4705413 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/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
|
# 2 "evals" needed to expand variable names
|
||||||
AC_SUBST([_sbindir])
|
AC_SUBST([_sbindir])
|
||||||
AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
|
AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
|
||||||
+AC_SUBST([_sysconfdir])
|
+AC_SUBST([_sysconfdir])
|
||||||
+AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$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
|
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
|
--- a/systemd/rpcbind.service.in
|
||||||
+++ b/systemd/rpcbind.service.in
|
+++ b/systemd/rpcbind.service.in
|
||||||
@@ -11,7 +11,7 @@ Wants=rpcbind.target
|
@@ -12,6 +12,7 @@ Wants=rpcbind.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=notify
|
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
|
+EnvironmentFile=-@_sysconfdir@/rpcbind.conf
|
||||||
ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
|
ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
--
|
--
|
||||||
2.23.0
|
2.34.1
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
|
|||||||
file://rpcbind_add_option_to_fix_port_number.patch \
|
file://rpcbind_add_option_to_fix_port_number.patch \
|
||||||
file://0001-systemd-use-EnvironmentFile.patch \
|
file://0001-systemd-use-EnvironmentFile.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de"
|
SRC_URI[sha256sum] = "f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e"
|
||||||
|
|
||||||
inherit autotools update-rc.d systemd pkgconfig update-alternatives
|
inherit autotools update-rc.d systemd pkgconfig update-alternatives
|
||||||
|
|
||||||
Reference in New Issue
Block a user