diff options
author | Joshua Lock <josh@linux.intel.com> | 2012-01-02 13:50:32 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-04 12:02:44 +0000 |
commit | 120ea473c4bff1eeeb0a31e9d3c56ae2c7dae9a4 (patch) | |
tree | a55f74cb16fb6bc441a4b8f681bcb0688b20ce09 /meta/recipes-core/busybox/busybox.inc | |
parent | 93855361b76565bef7b8cc5b474a51b20b328464 (diff) | |
download | poky-120ea473c4bff1eeeb0a31e9d3c56ae2c7dae9a4.tar.gz |
busybox: rename syslog.conf to syslog-startup.conf
Busybox 1.19 introduced basic support for an rsyslog inspired syslog.conf
whereas we've been shipping syslog.conf as a file to be sourced by the
syslog init script in order to configure which options busybox's syslog is
started with.
Busybox 1.19 in syslog mode chokes on our syslog.conf and doesn't start.
This patch renames the syslog.conf we ship to syslog-startup.conf in order
to prevent busybox trying to parse the file as an rsyslog style syslog.conf
Fixes [YOCTO #1848]
(From OE-Core rev: b406998019b577eac7f758298cc2695372e03d15)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox.inc')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 07ca782341..a107a020c1 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -17,7 +17,7 @@ export EXTRA_LDFLAGS = "${LDFLAGS}" | |||
17 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev" | 17 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev" |
18 | 18 | ||
19 | FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" | 19 | FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" |
20 | FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog.conf*" | 20 | FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf*" |
21 | FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" | 21 | FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf" |
22 | FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" | 22 | FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" |
23 | FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc ${sysconfdir}/init.d/busybox-udhcpc" | 23 | FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc ${sysconfdir}/init.d/busybox-udhcpc" |
@@ -30,7 +30,7 @@ INITSCRIPT_NAME_${PN}-mdev = "mdev" | |||
30 | INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." | 30 | INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." |
31 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" | 31 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" |
32 | INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" | 32 | INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" |
33 | CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${BPN}" | 33 | CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" |
34 | CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" | 34 | CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" |
35 | 35 | ||
36 | RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" | 36 | RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" |
@@ -168,7 +168,7 @@ do_install () { | |||
168 | 168 | ||
169 | if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then | 169 | if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then |
170 | install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN} | 170 | install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN} |
171 | install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${BPN} | 171 | install -m 644 ${WORKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf.${BPN} |
172 | fi | 172 | fi |
173 | if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then | 173 | if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then |
174 | install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ | 174 | install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ |
@@ -249,7 +249,7 @@ pkg_postinst_${PN} () { | |||
249 | 249 | ||
250 | pkg_postinst_${PN}-syslog () { | 250 | pkg_postinst_${PN}-syslog () { |
251 | update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${BPN} 50 | 251 | update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${BPN} 50 |
252 | update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${BPN} 50 | 252 | update-alternatives --install ${sysconfdir}/syslog-startup.conf syslog-startup-conf syslog-startup.conf.${BPN} 50 |
253 | } | 253 | } |
254 | 254 | ||
255 | pkg_prerm_${PN} () { | 255 | pkg_prerm_${PN} () { |
@@ -293,5 +293,5 @@ pkg_prerm_${PN}-syslog () { | |||
293 | fi | 293 | fi |
294 | 294 | ||
295 | update-alternatives --remove syslog-init syslog.${BPN} | 295 | update-alternatives --remove syslog-init syslog.${BPN} |
296 | update-alternatives --remove syslog-conf syslog.conf.${BPN} | 296 | update-alternatives --remove syslog-startup-conf syslog-startup.conf.${BPN} |
297 | } | 297 | } |