From 120ea473c4bff1eeeb0a31e9d3c56ae2c7dae9a4 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Mon, 2 Jan 2012 13:50:32 -0800 Subject: busybox: rename syslog.conf to syslog-startup.conf Busybox 1.19 introduced basic support for an rsyslog inspired syslog.conf whereas we've been shipping syslog.conf as a file to be sourced by the syslog init script in order to configure which options busybox's syslog is started with. Busybox 1.19 in syslog mode chokes on our syslog.conf and doesn't start. This patch renames the syslog.conf we ship to syslog-startup.conf in order to prevent busybox trying to parse the file as an rsyslog style syslog.conf Fixes [YOCTO #1848] (From OE-Core rev: b406998019b577eac7f758298cc2695372e03d15) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox.inc | 10 +++++----- meta/recipes-core/busybox/busybox_1.19.3.bb | 4 ++-- meta/recipes-core/busybox/files/syslog | 4 ++-- meta/recipes-core/busybox/files/syslog-startup.conf | 12 ++++++++++++ meta/recipes-core/busybox/files/syslog.conf | 9 --------- 5 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 meta/recipes-core/busybox/files/syslog-startup.conf delete mode 100644 meta/recipes-core/busybox/files/syslog.conf (limited to 'meta/recipes-core/busybox') diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 07ca782341..a107a020c1 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -17,7 +17,7 @@ export EXTRA_LDFLAGS = "${LDFLAGS}" PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" -FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog.conf*" +FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf*" 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 ${sysconfdir}/init.d/busybox-udhcpc" @@ -30,7 +30,7 @@ INITSCRIPT_NAME_${PN}-mdev = "mdev" INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${BPN}" +CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" @@ -168,7 +168,7 @@ do_install () { if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN} - install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${BPN} + install -m 644 ${WORKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf.${BPN} fi if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ @@ -249,7 +249,7 @@ pkg_postinst_${PN} () { pkg_postinst_${PN}-syslog () { update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${BPN} 50 - update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${BPN} 50 + update-alternatives --install ${sysconfdir}/syslog-startup.conf syslog-startup-conf syslog-startup.conf.${BPN} 50 } pkg_prerm_${PN} () { @@ -293,5 +293,5 @@ pkg_prerm_${PN}-syslog () { fi update-alternatives --remove syslog-init syslog.${BPN} - update-alternatives --remove syslog-conf syslog.conf.${BPN} + update-alternatives --remove syslog-startup-conf syslog-startup.conf.${BPN} } diff --git a/meta/recipes-core/busybox/busybox_1.19.3.bb b/meta/recipes-core/busybox/busybox_1.19.3.bb index 73602199e9..f591856a36 100644 --- a/meta/recipes-core/busybox/busybox_1.19.3.bb +++ b/meta/recipes-core/busybox/busybox_1.19.3.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r1" +PR = "r2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \ @@ -20,7 +20,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://hwclock.sh \ file://mount.busybox \ file://syslog \ - file://syslog.conf \ + file://syslog-startup.conf \ file://mdev \ file://mdev.conf \ file://umount.busybox \ diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog index 9edaa15053..5ff6599ee8 100644 --- a/meta/recipes-core/busybox/files/syslog +++ b/meta/recipes-core/busybox/files/syslog @@ -10,8 +10,8 @@ set -e -if [ -f /etc/syslog.conf ]; then - . /etc/syslog.conf +if [ -f /etc/syslog-startup.conf ]; then + . /etc/syslog-startup.conf LOG_LOCAL=0 LOG_REMOTE=0 for D in $DESTINATION; do diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf new file mode 100644 index 0000000000..903a60ce8b --- /dev/null +++ b/meta/recipes-core/busybox/files/syslog-startup.conf @@ -0,0 +1,12 @@ +# This configuration file is used by the busybox syslog init script, +# /etc/init.d/syslog[.busybox] to set syslog configuration at start time. + +DESTINATION=buffer # log destinations (buffer file remote) +MARKINT=20 # interval between --mark-- entries +LOGFILE=/var/log/messages # where to log (file) +REMOTE=loghost:514 # where to log (syslog remote) +REDUCE=no # reduce-size logging +#ROTATESIZE=0 # rotate log if grown beyond X [kByte] (incompatible with busybox) +#ROTATEGENS=3 # keep X generations of rotated logs (incompatible with busybox) +BUFFERSIZE=64 # size of circular buffer [kByte] +FOREGROUND=no # run in foreground (don't use!) diff --git a/meta/recipes-core/busybox/files/syslog.conf b/meta/recipes-core/busybox/files/syslog.conf deleted file mode 100644 index d4a0e02f5b..0000000000 --- a/meta/recipes-core/busybox/files/syslog.conf +++ /dev/null @@ -1,9 +0,0 @@ -DESTINATION="buffer" # log destinations (buffer file remote) -MARKINT=20 # intervall between --mark-- entries -LOGFILE=/var/log/messages # where to log (file) -REMOTE=loghost:514 # where to log (syslog remote) -REDUCE=no # reduce-size logging -#ROTATESIZE=0 # rotate log if grown beyond X [kByte] (incompatible with busybox) -#ROTATEGENS=3 # keep X generations of rotated logs (incompatible with busybox) -BUFFERSIZE=64 # size of circular buffer [kByte] -FOREGROUND=no # run in foreground (don't use!) -- cgit v1.2.3-54-g00ecf