| Submitter | Mark Hatle |
|---|---|
| Date | June 14, 2012, 7:50 p.m. |
| Message ID | <dcc637a3a6ff5a7eb3084bdbdd7023d82722e883.1339703427.git.mark.hatle@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/29897/ |
| State | Accepted |
| Commit | 935f2c02809814de2b903a704707d7bc85bbefdf |
| Headers | show |
Comments
Patch
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 \
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(-)