[PATCH 0/1] Fix incorrect busybox alternative

[PATCH 0/1] Fix incorrect busybox alternative

[Mark Hatle]

The following changes since commit ba380813c0198f95b1e786aa7f49b80c68cfe9b9:

  gcc-configure-target: Fix sysroot option breakage I introduced (sorry) (2012-06-14 19:48:07 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib mhatle/misc
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/misc

Mark Hatle (1):
  busybox: Fix syslog configuration file

 meta/recipes-core/busybox/busybox.inc       |    1 +
 meta/recipes-core/busybox/busybox_1.19.4.bb |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

-- 
1.7.3.4

[PATCH 1/1] busybox: Fix syslog configuration file

[Mark Hatle]

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]

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-core/busybox/busybox.inc       |    1 +
 meta/recipes-core/busybox/busybox_1.19.4.bb |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 5b83d32..18970ca 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -212,6 +212,7 @@ ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog"
 ALTERNATIVE_LINK_NAME[syslog-startup-conf] = "${sysconfdir}/syslog-startup.conf"
 
 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 0717075..5b3f356 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 = "r6"
+PR = "r7"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://B921600.patch \
-- 
1.7.3.4

Re: [PATCH 0/1] Fix incorrect busybox alternative

[Saul Wold]

On 06/14/2012 12:50 PM, Mark Hatle wrote:
> The following changes since commit ba380813c0198f95b1e786aa7f49b80c68cfe9b9:
>
>    gcc-configure-target: Fix sysroot option breakage I introduced (sorry) (2012-06-14 19:48:07 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib mhatle/misc
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/misc
>
> Mark Hatle (1):
>    busybox: Fix syslog configuration file
>
>   meta/recipes-core/busybox/busybox.inc       |    1 +
>   meta/recipes-core/busybox/busybox_1.19.4.bb |    2 +-
>   2 files changed, 2 insertions(+), 1 deletions(-)
>

Merged into OE-Core

Thanks
	Sau!