aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-06-14 14:50:59 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-18 13:16:36 +0100
commit935f2c02809814de2b903a704707d7bc85bbefdf (patch)
treed231708d401aa70e37517be5147901d2aa9e3b94 /meta/recipes-core/busybox
parent85d612737d050d4633013c706d9ad6b8169814af (diff)
downloadopenembedded-core-contrib-935f2c02809814de2b903a704707d7bc85bbefdf.tar.gz
openembedded-core-contrib-935f2c02809814de2b903a704707d7bc85bbefdf.tar.bz2
openembedded-core-contrib-935f2c02809814de2b903a704707d7bc85bbefdf.zip
busybox: Fix syslog configuration file
When update alternatives was modified, the syslog configuration file alternative was incorrectly defined to be "busybox". Fix this by enabling the proper target file. [YOCTO #2557] Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/busybox.inc1
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.4.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index db337ad6aba..a9a58e293cd 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -214,6 +214,7 @@ ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog"
ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf"
ALTERNATIVE_TARGET = "/bin/busybox"
+ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}"
python do_package_prepend () {
# We need to load the full set of busybox provides from the /etc/busybox.links
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index 0717075bbc0..5b3f3562cb8 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r6"
+PR = "r7"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://B921600.patch \