From patchwork Wed Jun 27 15:43:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 12/20] busybox: add correct ALTERNATIVE_TARGET for init.d/syslog Date: Wed, 27 Jun 2012 15:43:17 -0000 From: Saul Wold X-Patchwork-Id: 30743 Message-Id: <3e9e2a0df9bbf08d3b4f3c68ea86b593909eaee2.1340811559.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org [YOCTO #2535] Signed-off-by: Saul Wold --- meta/recipes-core/busybox/busybox.inc | 3 ++- 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 a9a58e2..82137a3 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 5b3f356..de331ad 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 \