Skip to contentSkip to conversation

Fix incorrect busybox alternative

PATCH Applied Mark Hatle 2 participants 3 messages Jun 14, 2012 – Jun 18, 2012

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Fix incorrect busybox alternative

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(-)
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/1 busybox: Fix syslog configuration file

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]

---
 meta/recipes-core/busybox/busybox.inc       |    1 +
 meta/recipes-core/busybox/busybox_1.19.4.bb |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-core/busybox/busybox.inc +1 -0
index 5b83d32..18970ca 100644
@@ -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
meta/recipes-core/busybox/busybox_1.19.4.bb +1 -1
index 0717075..5b3f356 100644
@@ -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 \
Signature · 1 line
1.7.3.4
Applied
#2 lore raw
In reply to Mark Hatle
Quoted 8 lines · 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

Quoted 7 lines

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!