systemd-compat-units: replace ${base_libdir}/systemd by ${systemd_unitdir} set in oe-core

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Andreas Müller
2012-03-22 19:59:36 +00:00
committed by Koen Kooi
parent ed8bbbc690
commit 815124f28e
@@ -10,15 +10,15 @@ inherit allarch
SRC_URI = "file://*.service" SRC_URI = "file://*.service"
do_install() { do_install() {
install -d ${D}${base_libdir}/systemd/system/basic.target.wants install -d ${D}${systemd_unitdir}/system/basic.target.wants
install -d ${D}${base_libdir}/systemd/system/sysinit.target.wants/ install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${base_libdir}/systemd/system install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/basic.target.wants/ ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
install -m 0644 ${WORKDIR}/machineid.service ${D}${base_libdir}/systemd/system install -m 0644 ${WORKDIR}/machineid.service ${D}${systemd_unitdir}/system
ln -sf ../machineid.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ ln -sf ../machineid.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
ln -sf ../machineid.service ${D}${base_libdir}/systemd/system/basic.target.wants/ ln -sf ../machineid.service ${D}${systemd_unitdir}/system/basic.target.wants/
# hack to make old style sysvinit postinsts succeed # hack to make old style sysvinit postinsts succeed
install -d ${D}${bindir} install -d ${D}${bindir}
@@ -33,12 +33,12 @@ echo -n "Disabling the following sysv scripts: "
for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog syslog.busybox ; do for i in busybox-udhcpc dnsmasq hwclock.sh networking syslog syslog.busybox ; do
if [ -e $i ] ; then if [ -e $i ] ; then
echo -n "$i " ; ln -s /dev/null $D${base_libdir}/systemd/system/$i.service echo -n "$i " ; ln -s /dev/null $D${systemd_unitdir}/system/$i.service
fi fi
done ; echo done ; echo
} }
FILES_${PN} = "${base_libdir}/systemd/system ${bindir}" FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
RDPEPENDS_${PN} = "systemd" RDPEPENDS_${PN} = "systemd"