diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-08-10 17:14:42 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-13 23:28:04 +0200 |
| commit | 2b0025ce8dd94fc66c0f487536f456bf255debe7 (patch) | |
| tree | 98d039a061af51e5dc18ee6d51fdd4a007ce1239 /meta-systemd/oe-core | |
| parent | 4b8bb9992ad3957076f351db6446702fd72773fd (diff) | |
| download | meta-openembedded-contrib-2b0025ce8dd94fc66c0f487536f456bf255debe7.tar.gz | |
busybox: systemd support now in OE-Core
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-systemd/oe-core')
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 @@ -[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 2e04321385..0000000000 --- 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 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 @@ -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" |