diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-10 21:46:39 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:05 +0200 |
commit | 326e027816d7af4d4896e9e6d74842aa327352e0 (patch) | |
tree | 2d6c61b77a7e3999de347b2339662f09bda6d461 /meta-oe/recipes-core | |
parent | 519d60e71767933eee082ee506b5deb2ad06fd3f (diff) | |
download | meta-openembedded-326e027816d7af4d4896e9e6d74842aa327352e0.tar.gz |
busybox: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-core')
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 @@ | |||
1 | [Unit] | ||
2 | Description=Kernel Logging Service | ||
3 | |||
4 | [Service] | ||
5 | ExecStart=@base_sbindir@/klogd -n | ||
6 | |||
7 | [Install] | ||
8 | 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 @@ | |||
1 | [Unit] | ||
2 | Description=System Logging Service | ||
3 | Wants=busybox-klogd.service | ||
4 | |||
5 | [Service] | ||
6 | ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service | ||
7 | EnvironmentFile=-/etc/default/busybox-syslog | ||
8 | ExecStart=@base_sbindir@/syslogd -n $OPTIONS | ||
9 | Sockets=syslog.socket | ||
10 | |||
11 | [Install] | ||
12 | WantedBy=multi-user.target | ||
13 | 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 @@ | |||
1 | inherit systemd | 1 | PRINC := "${@int(PRINC) + 5}" |
2 | |||
3 | PRINC := "${@int(PRINC) + 4}" | ||
4 | 2 | ||
5 | # look for files in the layer first | 3 | # look for files in the layer first |
6 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 4 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
7 | 5 | ||
8 | SRC_URI += "file://busybox-syslog.service.in \ | 6 | SRC_URI += "file://busybox-syslog.default" |
9 | file://busybox-klogd.service.in \ | ||
10 | file://busybox-syslog.default" | ||
11 | |||
12 | SYSTEMD_PACKAGES = "${PN}-syslog-systemd" | ||
13 | SYSTEMD_SERVICE_${PN}-syslog-systemd = "busybox-syslog.service" | ||
14 | 7 | ||
15 | do_install_append() { | 8 | do_install_append() { |
16 | install -d ${D}${sysconfdir}/default | 9 | install -d ${D}${sysconfdir}/default |
17 | install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog | 10 | install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog |
18 | |||
19 | install -d ${D}${systemd_unitdir}/system | ||
20 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ | ||
21 | > ${D}${systemd_unitdir}/system/busybox-syslog.service | ||
22 | sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ | ||
23 | > ${D}${systemd_unitdir}/system/busybox-klogd.service | ||
24 | |||
25 | ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service | ||
26 | } | 11 | } |
27 | FILES_${PN}-syslog-systemd = "${systemd_unitdir}/system/syslog.service" | ||