rpcbind: install rpcbind.conf

Message ID 20211113074701.329998-1-yi.zhao@windriver.com
State Accepted, archived
Commit 61fb93ff9b6129f6bd11a4535080529cc2a643df
Headers show
Series rpcbind: install rpcbind.conf | expand

Commit Message

Yi Zhao Nov. 13, 2021, 7:47 a.m. UTC
Although we provide rpcbind.conf, it isn't shipped to the package.
Also fix the sysconfdir in rpcbind.service.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch      | 2 +-
 meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Patch

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 b92f2cf7b1..79dc96050e 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch
+++ b/meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch
@@ -21,7 +21,7 @@  index 2dd9471..47a46c0 100644
  AC_SUBST([_sbindir])
  AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
 +AC_SUBST([_sysconfdir])
-+AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sbindir])
++AC_CONFIG_COMMANDS_PRE([eval eval _sysconfdir=$sysconfdir])
  
  AC_OUTPUT([Makefile systemd/rpcbind.service])
 diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
index 344faa37a4..dd89726afc 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
@@ -48,6 +48,7 @@  do_install:append () {
 		-e 's,/sbin/,${sbindir}/,g' \
 		${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
 	chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+	install -m 0644 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf
 }
 
 ALTERNATIVE:${PN} = "rpcinfo"