aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-core
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-06-10 21:46:39 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-07-16 09:39:05 +0200
commit326e027816d7af4d4896e9e6d74842aa327352e0 (patch)
tree2d6c61b77a7e3999de347b2339662f09bda6d461 /meta-oe/recipes-core
parent519d60e71767933eee082ee506b5deb2ad06fd3f (diff)
downloadmeta-openembedded-326e027816d7af4d4896e9e6d74842aa327352e0.tar.gz
meta-openembedded-326e027816d7af4d4896e9e6d74842aa327352e0.tar.bz2
meta-openembedded-326e027816d7af4d4896e9e6d74842aa327352e0.zip
busybox: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r--meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in8
-rw-r--r--meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in13
-rw-r--r--meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend20
3 files changed, 2 insertions, 39 deletions
diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in b/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
deleted file mode 100644
index d7c77558f..000000000
--- a/meta-oe/recipes-core/busybox/busybox/busybox-klogd.service.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kernel Logging Service
-
-[Service]
-ExecStart=@base_sbindir@/klogd -n
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
deleted file mode 100644
index 27b9831da..000000000
--- a/meta-oe/recipes-core/busybox/busybox/busybox-syslog.service.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=System Logging Service
-Wants=busybox-klogd.service
-
-[Service]
-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
-EnvironmentFile=-/etc/default/busybox-syslog
-ExecStart=@base_sbindir@/syslogd -n $OPTIONS
-Sockets=syslog.socket
-
-[Install]
-WantedBy=multi-user.target
-Also=busybox-klogd.service
diff --git a/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend b/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
index 786e1d52d..e9dd4ac9e 100644
--- a/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
+++ b/meta-oe/recipes-core/busybox/busybox_1.19.4.bbappend
@@ -1,27 +1,11 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 4}"
+PRINC := "${@int(PRINC) + 5}"
# look for files in the layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://busybox-syslog.service.in \
- file://busybox-klogd.service.in \
- file://busybox-syslog.default"
-
-SYSTEMD_PACKAGES = "${PN}-syslog-systemd"
-SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service"
+SRC_URI += "file://busybox-syslog.default"
do_install_append() {
install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
-
- install -d ${D}${systemd_unitdir}/system
- sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
- > ${D}${systemd_unitdir}/system/busybox-syslog.service
- sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
- > ${D}${systemd_unitdir}/system/busybox-klogd.service
-
- ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
}
-FILES_${PN}-syslog-systemd = "${systemd_unitdir}/system/syslog.service"