summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-08-23 12:20:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-26 11:47:19 +0100
commitb18b210c1e68bd312785b4d956e628220b5a8c9a (patch)
treecc753955b39414f9183198e1e9965a035c3ebc8d /meta
parent1506d3acaf2616339b2ae8e4b463179f85ebcb19 (diff)
downloadpoky-b18b210c1e68bd312785b4d956e628220b5a8c9a.tar.gz
busybox: enable shared memory logging for systemd
The default command-line options for launching busybox's syslogd are "-C" if using sysvinit; but because we use /etc/default/busybox-syslog when using systemd which the sysvinit initscript doesn't use, and no /etc/default/busybox-syslog is installed by default in OE-Core, the default arguments with systemd were no arguments at all with OE-Core alone. Effectively merge in the bbappend from meta-oe that adds a default file in order to set the default options to "-C" for systemd as well. (From OE-Core rev: a23aa8e7467cf2b7f4e8ff85a3aa841ff6b508e5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/busybox/busybox.inc7
-rw-r--r--meta/recipes-core/busybox/busybox_1.21.1.bb1
-rw-r--r--meta/recipes-core/busybox/files/busybox-syslog.default1
3 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 454d7e3cbe..b4cf20a77e 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -21,7 +21,7 @@ export EXTRA_LDFLAGS = "${LDFLAGS}"
21PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" 21PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock"
22 22
23FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" 23FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
24FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${systemd_unitdir}/system/syslog.service" 24FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog"
25FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" 25FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf"
26FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" 26FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
27FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" 27FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc"
@@ -272,6 +272,11 @@ do_install () {
272 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ 272 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \
273 > ${D}${systemd_unitdir}/system/busybox-klogd.service 273 > ${D}${systemd_unitdir}/system/busybox-klogd.service
274 274
275 if [ -f ${WORKDIR}/busybox-syslog.default ] ; then
276 install -d ${D}${sysconfdir}/default
277 install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog
278 fi
279
275 ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service 280 ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
276 fi 281 fi
277 282
diff --git a/meta/recipes-core/busybox/busybox_1.21.1.bb b/meta/recipes-core/busybox/busybox_1.21.1.bb
index fdb1974c91..784c924d50 100644
--- a/meta/recipes-core/busybox/busybox_1.21.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.21.1.bb
@@ -17,6 +17,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
17 file://mount.busybox \ 17 file://mount.busybox \
18 file://syslog \ 18 file://syslog \
19 file://syslog-startup.conf \ 19 file://syslog-startup.conf \
20 file://busybox-syslog.default \
20 file://mdev \ 21 file://mdev \
21 file://mdev.conf \ 22 file://mdev.conf \
22 file://umount.busybox \ 23 file://umount.busybox \
diff --git a/meta/recipes-core/busybox/files/busybox-syslog.default b/meta/recipes-core/busybox/files/busybox-syslog.default
new file mode 100644
index 0000000000..a3d51caa50
--- /dev/null
+++ b/meta/recipes-core/busybox/files/busybox-syslog.default
@@ -0,0 +1 @@
OPTIONS="-C"