summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-01-02 13:50:32 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-04 12:02:44 +0000
commit120ea473c4bff1eeeb0a31e9d3c56ae2c7dae9a4 (patch)
treea55f74cb16fb6bc441a4b8f681bcb0688b20ce09 /meta/recipes-core
parent93855361b76565bef7b8cc5b474a51b20b328464 (diff)
downloadpoky-120ea473c4bff1eeeb0a31e9d3c56ae2c7dae9a4.tar.gz
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 <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox.inc10
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.3.bb4
-rw-r--r--meta/recipes-core/busybox/files/syslog4
-rw-r--r--meta/recipes-core/busybox/files/syslog-startup.conf (renamed from meta/recipes-core/busybox/files/syslog.conf)7
4 files changed, 14 insertions, 11 deletions
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}"
17PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev" 17PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev"
18 18
19FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" 19FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
20FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog.conf*" 20FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf*"
21FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" 21FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf"
22FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" 22FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
23FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc ${sysconfdir}/init.d/busybox-udhcpc" 23FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc ${sysconfdir}/init.d/busybox-udhcpc"
@@ -30,7 +30,7 @@ INITSCRIPT_NAME_${PN}-mdev = "mdev"
30INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." 30INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
31INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 31INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
32INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" 32INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc"
33CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${BPN}" 33CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}"
34CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" 34CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
35 35
36RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" 36RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
@@ -168,7 +168,7 @@ do_install () {
168 168
169 if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then 169 if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
170 install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN} 170 install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN}
171 install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${BPN} 171 install -m 644 ${WORKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf.${BPN}
172 fi 172 fi
173 if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 173 if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
174 install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ 174 install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
@@ -249,7 +249,7 @@ pkg_postinst_${PN} () {
249 249
250pkg_postinst_${PN}-syslog () { 250pkg_postinst_${PN}-syslog () {
251 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${BPN} 50 251 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${BPN} 50
252 update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${BPN} 50 252 update-alternatives --install ${sysconfdir}/syslog-startup.conf syslog-startup-conf syslog-startup.conf.${BPN} 50
253} 253}
254 254
255pkg_prerm_${PN} () { 255pkg_prerm_${PN} () {
@@ -293,5 +293,5 @@ pkg_prerm_${PN}-syslog () {
293 fi 293 fi
294 294
295 update-alternatives --remove syslog-init syslog.${BPN} 295 update-alternatives --remove syslog-init syslog.${BPN}
296 update-alternatives --remove syslog-conf syslog.conf.${BPN} 296 update-alternatives --remove syslog-startup-conf syslog-startup.conf.${BPN}
297} 297}
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 @@
1require busybox.inc 1require busybox.inc
2PR = "r1" 2PR = "r2"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \
@@ -20,7 +20,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
20 file://hwclock.sh \ 20 file://hwclock.sh \
21 file://mount.busybox \ 21 file://mount.busybox \
22 file://syslog \ 22 file://syslog \
23 file://syslog.conf \ 23 file://syslog-startup.conf \
24 file://mdev \ 24 file://mdev \
25 file://mdev.conf \ 25 file://mdev.conf \
26 file://umount.busybox \ 26 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 @@
10 10
11set -e 11set -e
12 12
13if [ -f /etc/syslog.conf ]; then 13if [ -f /etc/syslog-startup.conf ]; then
14 . /etc/syslog.conf 14 . /etc/syslog-startup.conf
15 LOG_LOCAL=0 15 LOG_LOCAL=0
16 LOG_REMOTE=0 16 LOG_REMOTE=0
17 for D in $DESTINATION; do 17 for D in $DESTINATION; do
diff --git a/meta/recipes-core/busybox/files/syslog.conf b/meta/recipes-core/busybox/files/syslog-startup.conf
index d4a0e02f5b..903a60ce8b 100644
--- a/meta/recipes-core/busybox/files/syslog.conf
+++ b/meta/recipes-core/busybox/files/syslog-startup.conf
@@ -1,5 +1,8 @@
1DESTINATION="buffer" # log destinations (buffer file remote) 1# This configuration file is used by the busybox syslog init script,
2MARKINT=20 # intervall between --mark-- entries 2# /etc/init.d/syslog[.busybox] to set syslog configuration at start time.
3
4DESTINATION=buffer # log destinations (buffer file remote)
5MARKINT=20 # interval between --mark-- entries
3LOGFILE=/var/log/messages # where to log (file) 6LOGFILE=/var/log/messages # where to log (file)
4REMOTE=loghost:514 # where to log (syslog remote) 7REMOTE=loghost:514 # where to log (syslog remote)
5REDUCE=no # reduce-size logging 8REDUCE=no # reduce-size logging