From b18b210c1e68bd312785b4d956e628220b5a8c9a Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 23 Aug 2013 12:20:30 +0100 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 7 ++++++- meta/recipes-core/busybox/busybox_1.21.1.bb | 1 + meta/recipes-core/busybox/files/busybox-syslog.default | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/busybox/files/busybox-syslog.default (limited to 'meta/recipes-core/busybox') 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}" PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" -FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${systemd_unitdir}/system/syslog.service" +FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" @@ -272,6 +272,11 @@ do_install () { sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-klogd.service.in \ > ${D}${systemd_unitdir}/system/busybox-klogd.service + if [ -f ${WORKDIR}/busybox-syslog.default ] ; then + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/busybox-syslog.default ${D}${sysconfdir}/default/busybox-syslog + fi + ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service fi 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 \ file://mount.busybox \ file://syslog \ file://syslog-startup.conf \ + file://busybox-syslog.default \ file://mdev \ file://mdev.conf \ 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" -- cgit v1.2.3-54-g00ecf