aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox_1.19.3.bb
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:36 +0000
commitb406998019b577eac7f758298cc2695372e03d15 (patch)
tree19007d6d8d50eb635eb18906805f33c35ee48369 /meta/recipes-core/busybox/busybox_1.19.3.bb
parente5def5f36619c8f78fbb82f106f1ab7aab607532 (diff)
downloadopenembedded-core-contrib-b406998019b577eac7f758298cc2695372e03d15.tar.gz
openembedded-core-contrib-b406998019b577eac7f758298cc2695372e03d15.tar.bz2
openembedded-core-contrib-b406998019b577eac7f758298cc2695372e03d15.zip
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] Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox_1.19.3.bb')
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.3.bb4
1 files changed, 2 insertions, 2 deletions
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 \