[oe-commits] Andreas Müller : busybox: remove unneeded systemd code / use ${systemd_unitdir}
git at git.openembedded.org
git at git.openembedded.org
Thu Feb 23 17:02:32 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: 3a5e1a0d86b8fc8d1898e69b07e51a5f64f5e2c3
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=3a5e1a0d86b8fc8d1898e69b07e51a5f64f5e2c3
Author: Andreas Müller <schnitzeltony at googlemail.com>
Date: Wed Feb 22 16:56:45 2012 +0100
busybox: remove unneeded systemd code / use ${systemd_unitdir}
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
.../recipes-core/busybox/busybox_1.19.3.bbappend | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
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, at 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, at 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"
More information about the Openembedded-commits
mailing list