diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-06-25 16:43:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-28 16:26:44 +0100 |
commit | 6c7fccbd0949a5ef622bf2989af7ddae6572fd76 (patch) | |
tree | 6c383a56efe875f43943b8efd2ef0e5d1f192131 | |
parent | b8c9a593b59f0d8e8ae99a334f56c7c5fd74fc1d (diff) | |
download | poky-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>
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.19.4.bb | 2 |
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" | |||
210 | ALTERNATIVE_${PN}-syslog = "syslog-init syslog-startup-conf" | 210 | ALTERNATIVE_${PN}-syslog = "syslog-init syslog-startup-conf" |
211 | 211 | ||
212 | ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog" | 212 | ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog" |
213 | ALTERNATIVE_TARGET[syslog-init] = "${sysconfdir}/init.d/syslog.${BPN}" | ||
213 | 214 | ||
214 | ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf" | 215 | ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf" |
216 | ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}" | ||
215 | 217 | ||
216 | ALTERNATIVE_TARGET = "/bin/busybox" | 218 | ALTERNATIVE_TARGET = "/bin/busybox" |
217 | ALTERNATIVE_TARGET[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf.${BPN}" | ||
218 | 219 | ||
219 | python do_package_prepend () { | 220 | python 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 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | PR = "r7" | 2 | PR = "r8" |
3 | 3 | ||
4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
5 | file://B921600.patch \ | 5 | file://B921600.patch \ |