summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.3/defconfig2
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.3.bb2
-rw-r--r--meta/recipes-core/busybox/files/syslog3
-rw-r--r--meta/recipes-core/busybox/files/syslog-startup.conf1
4 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.19.3/defconfig b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
index ebd751d748..b474ad4087 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
@@ -997,7 +997,7 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
997CONFIG_SYSLOGD=y 997CONFIG_SYSLOGD=y
998CONFIG_FEATURE_ROTATE_LOGFILE=y 998CONFIG_FEATURE_ROTATE_LOGFILE=y
999CONFIG_FEATURE_REMOTE_LOG=y 999CONFIG_FEATURE_REMOTE_LOG=y
1000# CONFIG_FEATURE_SYSLOGD_DUP is not set 1000CONFIG_FEATURE_SYSLOGD_DUP=y
1001CONFIG_FEATURE_SYSLOGD_CFG=y 1001CONFIG_FEATURE_SYSLOGD_CFG=y
1002CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 1002CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
1003CONFIG_FEATURE_IPC_SYSLOG=y 1003CONFIG_FEATURE_IPC_SYSLOG=y
diff --git a/meta/recipes-core/busybox/busybox_1.19.3.bb b/meta/recipes-core/busybox/busybox_1.19.3.bb
index f591856a36..a0754071d9 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 @@
1require busybox.inc 1require busybox.inc
2PR = "r2" 2PR = "r3"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \
diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog
index deeea8ba65..2944d3d06c 100644
--- a/meta/recipes-core/busybox/files/syslog
+++ b/meta/recipes-core/busybox/files/syslog
@@ -40,6 +40,9 @@ if [ -f /etc/syslog-startup.conf ]; then
40 if [ "$REDUCE" = "yes" ]; then 40 if [ "$REDUCE" = "yes" ]; then
41 SYSLOG_ARGS="$SYSLOG_ARGS -S" 41 SYSLOG_ARGS="$SYSLOG_ARGS -S"
42 fi 42 fi
43 if [ "$DROPDUPLICATES" = "yes" ]; then
44 SYSLOG_ARGS="$SYSLOG_ARGS -D"
45 fi
43 if [ -n "$LOGLEVEL" ]; then 46 if [ -n "$LOGLEVEL" ]; then
44 SYSLOG_ARGS="$SYSLOG_ARGS -l $LOGLEVEL" 47 SYSLOG_ARGS="$SYSLOG_ARGS -l $LOGLEVEL"
45 fi 48 fi
diff --git a/meta/recipes-core/busybox/files/syslog-startup.conf b/meta/recipes-core/busybox/files/syslog-startup.conf
index 553490bd7d..fda450aa0d 100644
--- a/meta/recipes-core/busybox/files/syslog-startup.conf
+++ b/meta/recipes-core/busybox/files/syslog-startup.conf
@@ -5,6 +5,7 @@ DESTINATION=file # log destinations (buffer file remote)
5LOGFILE=/var/log/messages # where to log (file) 5LOGFILE=/var/log/messages # where to log (file)
6REMOTE=loghost:514 # where to log (syslog remote) 6REMOTE=loghost:514 # where to log (syslog remote)
7REDUCE=no # reduce-size logging 7REDUCE=no # reduce-size logging
8DROPDUPLICATES=no # whether to drop duplicate log entries
8#ROTATESIZE=0 # rotate log if grown beyond X [kByte] 9#ROTATESIZE=0 # rotate log if grown beyond X [kByte]
9#ROTATEGENS=3 # keep X generations of rotated logs 10#ROTATEGENS=3 # keep X generations of rotated logs
10BUFFERSIZE=64 # size of circular buffer [kByte] 11BUFFERSIZE=64 # size of circular buffer [kByte]