summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in8
-rw-r--r--meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in13
-rw-r--r--meta-systemd/oe-core/recipes-core/busybox/busybox_%.bbappend22
3 files changed, 0 insertions, 43 deletions
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 d7c77558f3..0000000000
--- a/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-klogd.service.in
+++ /dev/null
@@ -1,8 +0,0 @@
1[Unit]
2Description=Kernel Logging Service
3
4[Service]
5ExecStart=@base_sbindir@/klogd -n
6
7[Install]
8WantedBy=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 2e04321385..0000000000
--- a/meta-systemd/oe-core/recipes-core/busybox/busybox/busybox-syslog.service.in
+++ /dev/null
@@ -1,13 +0,0 @@
1[Unit]
2Description=System Logging Service
3Wants=busybox-klogd.service
4
5[Service]
6EnvironmentFile=-/etc/default/busybox-syslog
7ExecStart=@base_sbindir@/syslogd -n $OPTIONS
8Sockets=syslog.socket
9
10[Install]
11WantedBy=multi-user.target
12Also=busybox-klogd.service
13Alias=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 6362bdba65..642d450a51 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 @@
1inherit systemd
2
3# look for files in the layer first
4FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
5
6SRC_URI += "file://busybox-syslog.service.in \
7 file://busybox-klogd.service.in"
8
9SYSTEMD_PACKAGES = "${PN}-syslog"
10SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service"
11
12do_install_append() {
13 install -d ${D}${systemd_unitdir}/system
14 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
15 > ${D}${systemd_unitdir}/system/busybox-syslog.service
16 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
17 > ${D}${systemd_unitdir}/system/busybox-klogd.service
18
19 ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
20}
21FILES_${PN}-syslog += "${systemd_unitdir}/system/syslog.service"
22
23RPROVIDES_${PN}-syslog += "${PN}-syslog-systemd" 1RPROVIDES_${PN}-syslog += "${PN}-syslog-systemd"
24RREPLACES_${PN}-syslog += "${PN}-syslog-systemd" 2RREPLACES_${PN}-syslog += "${PN}-syslog-systemd"
25RCONFLICTS_${PN}-syslog += "${PN}-syslog-systemd" 3RCONFLICTS_${PN}-syslog += "${PN}-syslog-systemd"