[oe-commits] Andreas Müller : systemd-compat-units: replace ${base_libdir}/systemd by ${systemd_unitdir} set in oe-core
git at git.openembedded.org
git at git.openembedded.org
Fri Mar 23 07:00:52 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: 815124f28e80b00230f820d663966af3423e210b
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=815124f28e80b00230f820d663966af3423e210b
Author: Andreas Müller <schnitzeltony at googlemail.com>
Date: Thu Mar 22 19:59:36 2012 +0000
systemd-compat-units: replace ${base_libdir}/systemd by ${systemd_unitdir} set in oe-core
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
.../recipes-core/systemd/systemd-compat-units.bb | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta-oe/recipes-core/systemd/systemd-compat-units.bb b/meta-oe/recipes-core/systemd/systemd-compat-units.bb
index 2cbce67..c9a6b67 100644
--- a/meta-oe/recipes-core/systemd/systemd-compat-units.bb
+++ b/meta-oe/recipes-core/systemd/systemd-compat-units.bb
@@ -10,15 +10,15 @@ inherit allarch
SRC_URI = "file://*.service"
do_install() {
- install -d ${D}${base_libdir}/systemd/system/basic.target.wants
- install -d ${D}${base_libdir}/systemd/system/sysinit.target.wants/
- install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${base_libdir}/systemd/system
- ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/basic.target.wants/
- ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/
+ install -d ${D}${systemd_unitdir}/system/basic.target.wants
+ install -d ${D}${systemd_unitdir}/system/sysinit.target.wants/
+ install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
+ ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.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
- ln -sf ../machineid.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/
- ln -sf ../machineid.service ${D}${base_libdir}/systemd/system/basic.target.wants/
+ install -m 0644 ${WORKDIR}/machineid.service ${D}${systemd_unitdir}/system
+ ln -sf ../machineid.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
+ ln -sf ../machineid.service ${D}${systemd_unitdir}/system/basic.target.wants/
# hack to make old style sysvinit postinsts succeed
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
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
done ; echo
}
-FILES_${PN} = "${base_libdir}/systemd/system ${bindir}"
+FILES_${PN} = "${systemd_unitdir}/system ${bindir}"
RDPEPENDS_${PN} = "systemd"
More information about the Openembedded-commits
mailing list