summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Jörns <ejo@pengutronix.de>2024-10-28 09:29:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-01 12:07:12 +0000
commit952b3f335efb13560e3eafc1206b601c4bd2c2f9 (patch)
tree3ece7fd74f3fbb614c74aee4af101436a1098579
parentf4e1f39d9bf104bc216d27275643c5a2d8886f0b (diff)
downloadpoky-952b3f335efb13560e3eafc1206b601c4bd2c2f9.tar.gz
busybox: disable defconfig options from syslog.cfg
Accidentally enabled in 4335cd24 ("busybox: refresh the defconfig from 1.33.0"). (From OE-Core rev: 9a54f36a5a82d861536e42cc844641455b4c3738) Signed-off-by: Enrico Jörns <ejo@pengutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox/defconfig26
1 files changed, 11 insertions, 15 deletions
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 0ec65c65af..d2a210d535 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1214,21 +1214,17 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
1214# System Logging Utilities 1214# System Logging Utilities
1215# 1215#
1216CONFIG_KLOGD=y 1216CONFIG_KLOGD=y
1217
1218#
1219# klogd should not be used together with syslog to kernel printk buffer
1220#
1221CONFIG_FEATURE_KLOGD_KLOGCTL=y 1217CONFIG_FEATURE_KLOGD_KLOGCTL=y
1222CONFIG_LOGGER=y 1218CONFIG_LOGGER=y
1223CONFIG_LOGREAD=y 1219# CONFIG_LOGREAD is not set
1224CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y 1220# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
1225CONFIG_SYSLOGD=y 1221# CONFIG_SYSLOGD is not set
1226CONFIG_FEATURE_ROTATE_LOGFILE=y 1222# CONFIG_FEATURE_ROTATE_LOGFILE is not set
1227CONFIG_FEATURE_REMOTE_LOG=y 1223# CONFIG_FEATURE_REMOTE_LOG is not set
1228CONFIG_FEATURE_SYSLOGD_DUP=y 1224# CONFIG_FEATURE_SYSLOGD_DUP is not set
1229CONFIG_FEATURE_SYSLOGD_CFG=y 1225# CONFIG_FEATURE_SYSLOGD_CFG is not set
1230# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set 1226# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
1231CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 1227CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
1232CONFIG_FEATURE_IPC_SYSLOG=y 1228# CONFIG_FEATURE_IPC_SYSLOG is not set
1233CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64 1229CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
1234CONFIG_FEATURE_KMSG_SYSLOG=y 1230# CONFIG_FEATURE_KMSG_SYSLOG is not set