summaryrefslogtreecommitdiffstats
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:26:44 +0100
commit6c7fccbd0949a5ef622bf2989af7ddae6572fd76 (patch)
tree6c383a56efe875f43943b8efd2ef0e5d1f192131 /meta/recipes-core/busybox
parentb8c9a593b59f0d8e8ae99a334f56c7c5fd74fc1d (diff)
downloadpoky-6c7fccbd0949a5ef622bf2989af7ddae6572fd76.tar.gz
busybox: add correct ALTERNATIVE_TARGET for init.d/syslog
[YOCTO #2535] (From OE-Core rev: 36ea756883d35f654b102f0cd6bdb2ec284753d0) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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"
210ALTERNATIVE_${PN}-syslog = "syslog-init syslog-startup-conf" 210ALTERNATIVE_${PN}-syslog = "syslog-init syslog-startup-conf"
211 211
212ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog" 212ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog"
213ALTERNATIVE_TARGET[syslog-init] = "${sysconfdir}/init.d/syslog.${BPN}"
213 214
214ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf" 215ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf"
216ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}"
215 217
216ALTERNATIVE_TARGET = "/bin/busybox" 218ALTERNATIVE_TARGET = "/bin/busybox"
217ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}"
218 219
219python do_package_prepend () { 220python do_package_prepend () {
220 # We need to load the full set of busybox provides from the /etc/busybox.links 221 # 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 @@
1require busybox.inc 1require busybox.inc
2PR = "r7" 2PR = "r8"
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 \