[OE-core] [PATCH 28/42] rpcbind: Fix usage of systemd unitdir vars

Pau Espin Pedrol pespin.shar at gmail.com
Sun Mar 13 19:13:26 UTC 2016


Signed-off-by: Pau Espin Pedrol <pespin.shar at gmail.com>
---
 meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
index c19a197..0afec6d 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
@@ -47,7 +47,7 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir / \
                        --shell /bin/false --user-group rpc"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, \
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/, \
                           --without-systemdsystemunitdir, \
                           systemd \
 "
@@ -64,10 +64,10 @@ do_install_append () {
 	chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
 
 	install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/rpcbind.socket ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+	install -d ${D}${systemd_system_unitdir}
+	install -m 0644 ${WORKDIR}/rpcbind.socket ${D}${systemd_system_unitdir}
+	install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_system_unitdir}
 	sed -i -e 's, at SBINDIR@,${sbindir},g' \
 		-e 's, at SYSCONFDIR@,${sysconfdir},g' \
-		${D}${systemd_unitdir}/system/rpcbind.service
+		${D}${systemd_system_unitdir}/rpcbind.service
 }
-- 
2.7.1




More information about the Openembedded-core mailing list