systemd: '${systemd_unitdir}/system' => '${systemd_system_unitdir}'

Repo-wide replacement to use newer variable to represent systemd
system unitdir directory.

(From OE-Core rev: 5ace3ada5c54500c71becc8e0c6eddeb8bc053e3)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb
index a655de2aca..459f68f05e 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb
@@ -85,7 +85,7 @@ FILES:${PN}-client = "${sbindir}/*statd \
                       ${sysconfdir}/nfs-utils.conf \
                       ${sysconfdir}/nfsmount.conf \
                       ${sysconfdir}/init.d/nfscommon \
-                      ${systemd_unitdir}/system/nfs-statd.service"
+                      ${systemd_system_unitdir}/nfs-statd.service"
 RDEPENDS:${PN}-client = "${PN}-mount rpcbind"
 
 FILES:${PN}-mount = "${base_sbindir}/*mount.nfs*"
@@ -119,18 +119,18 @@ do_install:append () {
         install -m 0755 ${WORKDIR}/nfs-utils.conf ${D}${sysconfdir}
         install -m 0755 ${S}/utils/mount/nfsmount.conf ${D}${sysconfdir}
 
-        install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/nfs-server.service ${D}${systemd_unitdir}/system/
-        install -m 0644 ${WORKDIR}/nfs-mountd.service ${D}${systemd_unitdir}/system/
-        install -m 0644 ${WORKDIR}/nfs-statd.service ${D}${systemd_unitdir}/system/
+        install -d ${D}${systemd_system_unitdir}
+        install -m 0644 ${WORKDIR}/nfs-server.service ${D}${systemd_system_unitdir}/
+        install -m 0644 ${WORKDIR}/nfs-mountd.service ${D}${systemd_system_unitdir}/
+        install -m 0644 ${WORKDIR}/nfs-statd.service ${D}${systemd_system_unitdir}/
         sed -i -e 's,@SBINDIR@,${sbindir},g' \
                 -e 's,@SYSCONFDIR@,${sysconfdir},g' \
                 -e 's,@HIGH_RLIMIT_NOFILE@,${HIGH_RLIMIT_NOFILE},g' \
-                ${D}${systemd_unitdir}/system/*.service
+                ${D}${systemd_system_unitdir}/*.service
         if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-                install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/
-                install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
-                ln -sf ../proc-fs-nfsd.mount ${D}${systemd_unitdir}/system/sysinit.target.wants/proc-fs-nfsd.mount
+                install -m 0644 ${WORKDIR}/proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/
+                install -d ${D}${systemd_system_unitdir}/sysinit.target.wants/
+                ln -sf ../proc-fs-nfsd.mount ${D}${systemd_system_unitdir}/sysinit.target.wants/proc-fs-nfsd.mount
         fi
 
         # kernel code as of 3.8 hard-codes this path as a default