From 566bf7b36e2be19eb95871ec4f219a747e422e5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 22 Mar 2012 19:59:36 +0000 Subject: [PATCH] systemd-compat-units: replace ${base_libdir}/systemd by ${systemd_unitdir} set in oe-core MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (From meta-openembedded rev: 815124f28e80b00230f820d663966af3423e210b) Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi Signed-off-by: Patrick Ohly --- .../recipes-core/systemd/systemd-compat-units.bb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-core/systemd/systemd-compat-units.bb b/meta-openembedded/meta-oe/recipes-core/systemd/systemd-compat-units.bb index 2cbce67..c9a6b67 100644 --- a/meta-openembedded/meta-oe/recipes-core/systemd/systemd-compat-units.bb +++ b/meta-openembedded/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" -- 2.7.4