Patchwork [meta-systemd,2/5] busybox: systemd support now in OE-Core

login
register
mail settings
Submitter Paul Eggleton
Date Aug. 10, 2014, 4:14 p.m.
Message ID <d863c47f2ae05e03df91aaab124ea602e208fcfe.1407687153.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/77813/
State Accepted, archived
Headers show

Comments

Paul Eggleton - Aug. 10, 2014, 4:14 p.m.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../busybox/busybox/busybox-klogd.service.in       |  8 --------
 .../busybox/busybox/busybox-syslog.service.in      | 13 -------------
 .../recipes-core/busybox/busybox_%.bbappend        | 22 ----------------------
 3 files changed, 43 deletions(-)
 delete mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in
 delete mode 100644 meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in

Patch

diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in b/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in
deleted file mode 100644
index d7c7755..0000000
--- a/meta-systemd/oe-core/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-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in b/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in
deleted file mode 100644
index 2e04321..0000000
--- a/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in
+++ /dev/null
@@ -1,13 +0,0 @@ 
-[Unit]
-Description=System Logging Service
-Wants=busybox-klogd.service
-
-[Service]
-EnvironmentFile=-/etc/default/busybox-syslog
-ExecStart=@base_sbindir@/syslogd -n $OPTIONS
-Sockets=syslog.socket
-
-[Install]
-WantedBy=multi-user.target
-Also=busybox-klogd.service
-Alias=syslog.service
diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend b/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend
index 6362bdb..642d450 100644
--- a/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend
@@ -1,25 +1,3 @@ 
-inherit systemd
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://busybox-syslog.service.in \
-            file://busybox-klogd.service.in"
-
-SYSTEMD_PACKAGES = "${PN}-syslog"
-SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service"
-
-do_install_append() {
-    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_unitdir}/system/syslog.service"
-
 RPROVIDES_${PN}-syslog += "${PN}-syslog-systemd"
 RREPLACES_${PN}-syslog += "${PN}-syslog-systemd"
 RCONFLICTS_${PN}-syslog += "${PN}-syslog-systemd"