summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
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:22:18 +0100
commitc16eddd1d954284e905f265076c0258cca923fe2 (patch)
tree94d3456fd4fde9edfa0420ef4cc7f8deb1bd9573 /meta/recipes-core
parent9890bf81823017610eceebfa31d4f47cab3e935f (diff)
downloadpoky-c16eddd1d954284e905f265076c0258cca923fe2.tar.gz
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] (From OE-Core rev: 935f2c02809814de2b903a704707d7bc85bbefdf) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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 db337ad6ab..a9a58e293c 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"
214ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf" 214ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf"
215 215
216ALTERNATIVE_TARGET = "/bin/busybox" 216ALTERNATIVE_TARGET = "/bin/busybox"
217ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}"
217 218
218python do_package_prepend () { 219python do_package_prepend () {
219 # We need to load the full set of busybox provides from the /etc/busybox.links 220 # 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 0717075bbc..5b3f3562cb 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 @@
1require busybox.inc 1require busybox.inc
2PR = "r6" 2PR = "r7"
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://B921600.patch \ 5 file://B921600.patch \