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, 7 insertions, 7 deletions

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index d85e2a3d7a..808c3dc700 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -24,7 +24,7 @@ EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${
 PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock"
 
 FILES:${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
-FILES:${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog"
+FILES:${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_system_unitdir}/syslog.service ${sysconfdir}/default/busybox-syslog"
 FILES:${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*"
 FILES:${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
 FILES:${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc"
@@ -317,17 +317,17 @@ do_install () {
 
         if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
                 if grep -q "CONFIG_KLOGD=y" ${B}/.config; then
-                        install -d ${D}${systemd_unitdir}/system
+                        install -d ${D}${systemd_system_unitdir}
                         sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
-                        > ${D}${systemd_unitdir}/system/busybox-klogd.service
+                        > ${D}${systemd_system_unitdir}/busybox-klogd.service
                 fi
 
                 if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then
-                        install -d ${D}${systemd_unitdir}/system
+                        install -d ${D}${systemd_system_unitdir}
                         sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
-                        > ${D}${systemd_unitdir}/system/busybox-syslog.service
-                        if  [ ! -e ${D}${systemd_unitdir}/system/busybox-klogd.service ] ; then
-                                sed -i '/klog/d' ${D}${systemd_unitdir}/system/busybox-syslog.service
+                        > ${D}${systemd_system_unitdir}/busybox-syslog.service
+                        if  [ ! -e ${D}${systemd_system_unitdir}/busybox-klogd.service ] ; then
+                                sed -i '/klog/d' ${D}${systemd_system_unitdir}/busybox-syslog.service
                         fi
                         if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
                                 install -d ${D}${sysconfdir}/default