diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2021-11-13 15:47:01 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-13 16:11:28 +0000 |
commit | d507e6ea3228f0f63f0a6234027b0dd37f48c6eb (patch) | |
tree | 74a0c2248dad2f20efc03dcc40733758ade63817 /meta/recipes-extended/rpcbind | |
parent | 9c3e6fd9b6d181c522f4cacff274599ad750c23a (diff) | |
download | poky-d507e6ea3228f0f63f0a6234027b0dd37f48c6eb.tar.gz |
rpcbind: install rpcbind.conf
Although we provide rpcbind.conf, it isn't shipped to the package.
Also fix the sysconfdir in rpcbind.service.
(From OE-Core rev: 61fb93ff9b6129f6bd11a4535080529cc2a643df)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/rpcbind')
-rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind/0001-systemd-use-EnvironmentFile.patch | 2 | ||||
-rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb | 1 |
2 files changed, 2 insertions, 1 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 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 | |||
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=$sbindir]) | 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]) |
27 | diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in | 27 | 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 () { | |||
48 | -e 's,/sbin/,${sbindir}/,g' \ | 48 | -e 's,/sbin/,${sbindir}/,g' \ |
49 | ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind | 49 | ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind |
50 | chmod 0755 ${D}${sysconfdir}/init.d/rpcbind | 50 | chmod 0755 ${D}${sysconfdir}/init.d/rpcbind |
51 | install -m 0644 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf | ||
51 | } | 52 | } |
52 | 53 | ||
53 | ALTERNATIVE:${PN} = "rpcinfo" | 54 | ALTERNATIVE:${PN} = "rpcinfo" |