aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-06-25 16:43:05 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-28 16:23:17 +0100
commit36ea756883d35f654b102f0cd6bdb2ec284753d0 (patch)
tree126c10dcee890ecf3ee2446433c2eda1c701a357 /meta/recipes-core/busybox
parent1c5a127d075ebf78b70d14e3ca1d0ff640a80cb8 (diff)
downloadopenembedded-core-36ea756883d35f654b102f0cd6bdb2ec284753d0.tar.gz
busybox: add correct ALTERNATIVE_TARGET for init.d/syslog
[YOCTO #2535] Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/busybox.inc3
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.4.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index a9a58e293c..82137a3c0e 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -210,11 +210,12 @@ ALTERNATIVE_PRIORITY = "50"
ALTERNATIVE_${PN}-syslog = "syslog-init syslog-startup-conf"
ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog"
+ALTERNATIVE_TARGET[syslog-init] = "${sysconfdir}/init.d/syslog.${BPN}"
ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf"
+ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}"
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 5b3f3562cb..de331ad71a 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 = "r7"
+PR = "r8"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://B921600.patch \