forked from Ivasoft/openwrt
busybox: update to version 1.25.0
The following patches were removed:
010-networking-fix-uninitialized-memory-when-displaying-.patch
https://git.busybox.net/busybox/commit/?id=f2c043acfcf9dad9fd3d65821b81f89986bbe54e
030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch
https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f
204-udhcpc_src_ip_rebind.patch
https://git.busybox.net/busybox/commit/?id=abe8f7515aded80889d78c2c1c8947997918cf90
230-ntpd_delayed_resolve.patch
https://git.busybox.net/busybox/commit/?id=c8641962e4cbde48108ddfc1c105e3320778190d
https://git.busybox.net/busybox/commit/?id=e4caf1dd9ce8569371a0eeb77ccf02a572dc0f11
260-arping_missing_includes.patch
Not needed any more, still builds with musl for me.
Add in 92fd6e6f1a "busybox: fix arping applet building on musl"
The Kconfig files were updated with these commands:
cd config
../convert_menuconfig.pl .../build_dir/target-*/busybox-1.25.0
cd ..
./convert_defaults.pl < .../build_dir/target-*/busybox-1.25.0/.config > Config-defaults.in
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
@@ -6,6 +6,64 @@
|
||||
|
||||
menu "System Logging Utilities"
|
||||
|
||||
config BUSYBOX_CONFIG_KLOGD
|
||||
bool "klogd"
|
||||
default BUSYBOX_DEFAULT_KLOGD
|
||||
help
|
||||
klogd is a utility which intercepts and logs all
|
||||
messages from the Linux kernel and sends the messages
|
||||
out to the 'syslogd' utility so they can be logged. If
|
||||
you wish to record the messages produced by the kernel,
|
||||
you should enable this option.
|
||||
|
||||
comment "klogd should not be used together with syslog to kernel printk buffer"
|
||||
depends on BUSYBOX_CONFIG_KLOGD && BUSYBOX_CONFIG_FEATURE_KMSG_SYSLOG
|
||||
|
||||
config BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL
|
||||
bool "Use the klogctl() interface"
|
||||
default BUSYBOX_DEFAULT_FEATURE_KLOGD_KLOGCTL
|
||||
depends on BUSYBOX_CONFIG_KLOGD
|
||||
select BUSYBOX_CONFIG_PLATFORM_LINUX
|
||||
help
|
||||
The klogd applet supports two interfaces for reading
|
||||
kernel messages. Linux provides the klogctl() interface
|
||||
which allows reading messages from the kernel ring buffer
|
||||
independently from the file system.
|
||||
|
||||
If you answer 'N' here, klogd will use the more portable
|
||||
approach of reading them from /proc or a device node.
|
||||
However, this method requires the file to be available.
|
||||
|
||||
If in doubt, say 'Y'.
|
||||
config BUSYBOX_CONFIG_LOGGER
|
||||
bool "logger"
|
||||
default BUSYBOX_DEFAULT_LOGGER
|
||||
select BUSYBOX_CONFIG_FEATURE_SYSLOG
|
||||
help
|
||||
The logger utility allows you to send arbitrary text
|
||||
messages to the system log (i.e. the 'syslogd' utility) so
|
||||
they can be logged. This is generally used to help locate
|
||||
problems that occur within programs and scripts.
|
||||
config BUSYBOX_CONFIG_LOGREAD
|
||||
bool "logread"
|
||||
default BUSYBOX_DEFAULT_LOGREAD
|
||||
depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
|
||||
help
|
||||
If you enabled Circular Buffer support, you almost
|
||||
certainly want to enable this feature as well. This
|
||||
utility will allow you to read the messages that are
|
||||
stored in the syslogd circular buffer.
|
||||
|
||||
config BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
|
||||
bool "Double buffering"
|
||||
default BUSYBOX_DEFAULT_FEATURE_LOGREAD_REDUCED_LOCKING
|
||||
depends on BUSYBOX_CONFIG_LOGREAD
|
||||
help
|
||||
'logread' ouput to slow serial terminals can have
|
||||
side effects on syslog because of the semaphore.
|
||||
This option make logread to double buffer copy
|
||||
from circular buffer, minimizing semaphore
|
||||
contention at some minor memory expense.
|
||||
|
||||
config BUSYBOX_CONFIG_SYSLOGD
|
||||
bool "syslogd"
|
||||
@@ -28,7 +86,7 @@ config BUSYBOX_CONFIG_FEATURE_ROTATE_LOGFILE
|
||||
depends on BUSYBOX_CONFIG_SYSLOGD
|
||||
help
|
||||
This enables syslogd to rotate the message files
|
||||
on his own. No need to use an external rotatescript.
|
||||
on his own. No need to use an external rotate script.
|
||||
|
||||
config BUSYBOX_CONFIG_FEATURE_REMOTE_LOG
|
||||
bool "Remote Log support"
|
||||
@@ -92,27 +150,6 @@ config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE
|
||||
This option sets the size of the circular buffer
|
||||
used to record system log messages.
|
||||
|
||||
config BUSYBOX_CONFIG_LOGREAD
|
||||
bool "logread"
|
||||
default BUSYBOX_DEFAULT_LOGREAD
|
||||
depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
|
||||
help
|
||||
If you enabled Circular Buffer support, you almost
|
||||
certainly want to enable this feature as well. This
|
||||
utility will allow you to read the messages that are
|
||||
stored in the syslogd circular buffer.
|
||||
|
||||
config BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
|
||||
bool "Double buffering"
|
||||
default BUSYBOX_DEFAULT_FEATURE_LOGREAD_REDUCED_LOCKING
|
||||
depends on BUSYBOX_CONFIG_LOGREAD
|
||||
help
|
||||
'logread' ouput to slow serial terminals can have
|
||||
side effects on syslog because of the semaphore.
|
||||
This option make logread to double buffer copy
|
||||
from circular buffer, minimizing semaphore
|
||||
contention at some minor memory expense.
|
||||
|
||||
config BUSYBOX_CONFIG_FEATURE_KMSG_SYSLOG
|
||||
bool "Linux kernel printk buffer support"
|
||||
default BUSYBOX_DEFAULT_FEATURE_KMSG_SYSLOG
|
||||
@@ -126,44 +163,4 @@ config BUSYBOX_CONFIG_FEATURE_KMSG_SYSLOG
|
||||
|
||||
NOTICE: Syslog facilities in log entries needs kernel 3.5+.
|
||||
|
||||
config BUSYBOX_CONFIG_KLOGD
|
||||
bool "klogd"
|
||||
default BUSYBOX_DEFAULT_KLOGD
|
||||
help
|
||||
klogd is a utility which intercepts and logs all
|
||||
messages from the Linux kernel and sends the messages
|
||||
out to the 'syslogd' utility so they can be logged. If
|
||||
you wish to record the messages produced by the kernel,
|
||||
you should enable this option.
|
||||
|
||||
comment "klogd should not be used together with syslog to kernel printk buffer"
|
||||
depends on BUSYBOX_CONFIG_KLOGD && BUSYBOX_CONFIG_FEATURE_KMSG_SYSLOG
|
||||
|
||||
config BUSYBOX_CONFIG_FEATURE_KLOGD_KLOGCTL
|
||||
bool "Use the klogctl() interface"
|
||||
default BUSYBOX_DEFAULT_FEATURE_KLOGD_KLOGCTL
|
||||
depends on BUSYBOX_CONFIG_KLOGD
|
||||
select BUSYBOX_CONFIG_PLATFORM_LINUX
|
||||
help
|
||||
The klogd applet supports two interfaces for reading
|
||||
kernel messages. Linux provides the klogctl() interface
|
||||
which allows reading messages from the kernel ring buffer
|
||||
independently from the file system.
|
||||
|
||||
If you answer 'N' here, klogd will use the more portable
|
||||
approach of reading them from /proc or a device node.
|
||||
However, this method requires the file to be available.
|
||||
|
||||
If in doubt, say 'Y'.
|
||||
|
||||
config BUSYBOX_CONFIG_LOGGER
|
||||
bool "logger"
|
||||
default BUSYBOX_DEFAULT_LOGGER
|
||||
select BUSYBOX_CONFIG_FEATURE_SYSLOG
|
||||
help
|
||||
The logger utility allows you to send arbitrary text
|
||||
messages to the system log (i.e. the 'syslogd' utility) so
|
||||
they can be logged. This is generally used to help locate
|
||||
problems that occur within programs and scripts.
|
||||
|
||||
endmenu
|
||||
|
||||
Reference in New Issue
Block a user