From 04e2be75926b117ab190e1bf75299ad75ea6bf4f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Wed, 22 Feb 2012 16:56:45 +0100 Subject: [PATCH] busybox: remove unneeded systemd code / use ${systemd_unitdir} MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (From meta-openembedded rev: 3a5e1a0d86b8fc8d1898e69b07e51a5f64f5e2c3) Signed-off-by: Andreas Müller Signed-off-by: Koen Kooi Signed-off-by: Patrick Ohly --- .../meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend b/meta-openembedded/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend index 98b959f..2c73732 100644 --- a/meta-openembedded/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend +++ b/meta-openembedded/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend @@ -1,6 +1,6 @@ inherit systemd -PRINC := "${@int(PRINC) + 2}" +PRINC := "${@int(PRINC) + 3}" # look for files in the layer first FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" @@ -16,16 +16,11 @@ do_install_append() { install -d ${D}${sysconfdir}/default install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog - install -d ${D}${base_libdir}/systemd/system sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ - > ${D}${base_libdir}/systemd/system/busybox-syslog.service + > ${D}${systemd_unitdir}/system/busybox-syslog.service sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ - > ${D}${base_libdir}/systemd/system/busybox-klogd.service + > ${D}${systemd_unitdir}/system/busybox-klogd.service - ln -sf /dev/null ${D}${base_libdir}/systemd/system/syslog.service + ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service } - -PACKAGES += "${PN}-syslog-systemd" - -RDEPENDS_${PN}-syslog-systemd += "${PN}-syslog" -FILES_${PN}-syslog-systemd = "${base_libdir}/systemd" +FILES_${PN}-syslog-systemd = "${systemd_unitdir}/system/syslog.service" -- 2.7.4