diff options
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 10 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.19.3.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/busybox/files/syslog | 4 | ||||
-rw-r--r-- | meta/recipes-core/busybox/files/syslog-startup.conf (renamed from meta/recipes-core/busybox/files/syslog.conf) | 7 |
4 files changed, 14 insertions, 11 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 | } |
diff --git a/meta/recipes-core/busybox/busybox_1.19.3.bb b/meta/recipes-core/busybox/busybox_1.19.3.bb index 73602199e9..f591856a36 100644 --- a/meta/recipes-core/busybox/busybox_1.19.3.bb +++ b/meta/recipes-core/busybox/busybox_1.19.3.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | PR = "r1" | 2 | PR = "r2" |
3 | 3 | ||
4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
5 | file://udhcpscript.patch \ | 5 | file://udhcpscript.patch \ |
@@ -20,7 +20,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
20 | file://hwclock.sh \ | 20 | file://hwclock.sh \ |
21 | file://mount.busybox \ | 21 | file://mount.busybox \ |
22 | file://syslog \ | 22 | file://syslog \ |
23 | file://syslog.conf \ | 23 | file://syslog-startup.conf \ |
24 | file://mdev \ | 24 | file://mdev \ |
25 | file://mdev.conf \ | 25 | file://mdev.conf \ |
26 | file://umount.busybox \ | 26 | file://umount.busybox \ |
diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog index 9edaa15053..5ff6599ee8 100644 --- a/meta/recipes-core/busybox/files/syslog +++ b/meta/recipes-core/busybox/files/syslog | |||
@@ -10,8 +10,8 @@ | |||
10 | 10 | ||
11 | set -e | 11 | set -e |
12 | 12 | ||
13 | if [ -f /etc/syslog.conf ]; then | 13 | if [ -f /etc/syslog-startup.conf ]; then |
14 | . /etc/syslog.conf | 14 | . /etc/syslog-startup.conf |
15 | LOG_LOCAL=0 | 15 | LOG_LOCAL=0 |
16 | LOG_REMOTE=0 | 16 | LOG_REMOTE=0 |
17 | for D in $DESTINATION; do | 17 | for D in $DESTINATION; do |
diff --git a/meta/recipes-core/busybox/files/syslog.conf b/meta/recipes-core/busybox/files/syslog-startup.conf index d4a0e02f5b..903a60ce8b 100644 --- a/meta/recipes-core/busybox/files/syslog.conf +++ b/meta/recipes-core/busybox/files/syslog-startup.conf | |||
@@ -1,5 +1,8 @@ | |||
1 | DESTINATION="buffer" # log destinations (buffer file remote) | 1 | # This configuration file is used by the busybox syslog init script, |
2 | MARKINT=20 # intervall between --mark-- entries | 2 | # /etc/init.d/syslog[.busybox] to set syslog configuration at start time. |
3 | |||
4 | DESTINATION=buffer # log destinations (buffer file remote) | ||
5 | MARKINT=20 # interval between --mark-- entries | ||
3 | LOGFILE=/var/log/messages # where to log (file) | 6 | LOGFILE=/var/log/messages # where to log (file) |
4 | REMOTE=loghost:514 # where to log (syslog remote) | 7 | REMOTE=loghost:514 # where to log (syslog remote) |
5 | REDUCE=no # reduce-size logging | 8 | REDUCE=no # reduce-size logging |