Patchwork [meta-oe,V3,22/23] busybox: remove unneeded systemd code / use ${systemd_unitdir}

login
register
mail settings
Submitter Andreas Müller
Date Feb. 23, 2012, 12:10 p.m.
Message ID <1329999054-23112-23-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/21649/
State Accepted
Commit 3a5e1a0d86b8fc8d1898e69b07e51a5f64f5e2c3
Headers show

Comments

Andreas Müller - Feb. 23, 2012, 12:10 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-core/busybox/busybox_1.19.3.bbappend   |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

Patch

diff --git a/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend b/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
index 98b959f..2c73732 100644
--- a/meta-oe/recipes-core/busybox/busybox_1.19.3.bbappend
+++ b/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"