From f5a32ccc8db573d377e491105bdb95f36c0ad977 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 24 Jan 2017 05:14:13 +0100 Subject: busybox: update to 1.26.2 --- package/busybox/config/networking/Config.in | 39 ++--------------- package/busybox/config/networking/udhcp/Config.in | 6 +-- package/busybox/config/shell/Config.in | 51 ++++++----------------- 3 files changed, 18 insertions(+), 78 deletions(-) (limited to 'package/busybox/config') diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index cedbc4482..c7022d8e4 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -496,21 +496,6 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP Use the iproute "ip" command to implement "ifup" and "ifdown", rather than the default of using the older 'ifconfig' and 'route' utilities. -config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN - bool "Use busybox ip applet" - default y if !BUSYBOX_DISABLE_IP - depends on BUSYBOX_FEATURE_IFUPDOWN_IP - select BUSYBOX_PLATFORM_LINUX - select BUSYBOX_IP - select BUSYBOX_FEATURE_IP_ADDRESS - select BUSYBOX_FEATURE_IP_LINK - select BUSYBOX_FEATURE_IP_ROUTE - help - Use the busybox iproute "ip" applet to implement "ifupdown". - - If left disabled, you must install the full-blown iproute2 - utility or the "ifup" and "ifdown" applets will not work. - config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN bool "Use busybox ifconfig and route applets" default n @@ -675,21 +660,6 @@ config BUSYBOX_FEATURE_IP_NEIGH help Add support for neighbor commands to "ip". -config BUSYBOX_FEATURE_IP_SHORT_FORMS - bool "Support short forms of ip commands" - default n - depends on BUSYBOX_IP - help - Also support short-form of ip commands: - ip addr -> ipaddr - ip link -> iplink - ip route -> iproute - ip tunnel -> iptunnel - ip rule -> iprule - - Say N unless you desparately need the short form of the ip - object commands. - config BUSYBOX_FEATURE_IP_RARE_PROTOCOLS bool "Support displaying rarely used link types" default n @@ -703,27 +673,26 @@ config BUSYBOX_FEATURE_IP_RARE_PROTOCOLS config BUSYBOX_IPADDR bool default n - depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_ADDRESS config BUSYBOX_IPLINK bool default n - depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_LINK config BUSYBOX_IPROUTE bool default n - depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_ROUTE config BUSYBOX_IPTUNNEL bool default n - depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_TUNNEL config BUSYBOX_IPRULE bool default n - depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_RULE + +config BUSYBOX_IPNEIGH + bool + default n config BUSYBOX_IPCALC bool "ipcalc" diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index aec0fd62f..02e56c3ef 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -20,8 +20,7 @@ config BUSYBOX_UDHCPD config BUSYBOX_DHCPRELAY bool "dhcprelay" - default y - depends on BUSYBOX_UDHCPD + default n help dhcprelay listens for dhcp requests on one or more interfaces and forwards these requests to a different interface or dhcp @@ -29,8 +28,7 @@ config BUSYBOX_DHCPRELAY config BUSYBOX_DUMPLEASES bool "Lease display utility (dumpleases)" - default y - depends on BUSYBOX_UDHCPD + default n help dumpleases displays the leases written out by the udhcpd server. Lease times are stored in the file by time remaining in lease, or diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 019b3e600..09a46edad 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -166,6 +166,7 @@ config BUSYBOX_CTTYHACK Starting getty on a controlling tty from a shell script: # getty 115200 $(cttyhack) + config BUSYBOX_HUSH bool "hush" default y if ADK_TARGET_UCLINUX @@ -302,62 +303,34 @@ config BUSYBOX_MSH help msh is deprecated and will be removed, please migrate to hush. - - choice - prompt "Choose which shell is aliased to 'sh' name" - default FEATURE_SH_IS_NONE - help - Choose which shell you want to be executed by 'sh' alias. - The ash shell is the most bash compatible and full featured one. +prompt "Choose which shell is aliased to 'sh' name" -# note: cannot use "select ASH" here, it breaks "make allnoconfig" -config BUSYBOX_FEATURE_SH_IS_ASH - depends on BUSYBOX_ASH +config BUSYBOX_SH_IS_NONE + bool "none" + +config BUSYBOX_SH_IS_ASH bool "ash" - depends on !BUSYBOX_NOMMU -config BUSYBOX_FEATURE_SH_IS_HUSH - depends on BUSYBOX_HUSH +config BUSYBOX_SH_IS_HUSH bool "hush" -config BUSYBOX_FEATURE_SH_IS_NONE - bool "none" - endchoice choice - prompt "Choose which shell is aliased to 'bash' name" - default FEATURE_BASH_IS_NONE - help - Choose which shell you want to be executed by 'bash' alias. - The ash shell is the most bash compatible and full featured one. - - Note that selecting this option does not switch on any bash - compatibility code. It merely makes it possible to install - /bin/bash (sym)link and run scripts which start with - #!/bin/bash line. +prompt "Choose which shell is aliased to 'bash' name" - Many systems use it in scripts which use bash-specific features, - even simple ones like $RANDOM. Without this option, busybox - can't be used for running them because it won't recongnize - "bash" as a supported applet name. +config BUSYBOX_BASH_IS_NONE + bool "none" -config BUSYBOX_FEATURE_BASH_IS_ASH - depends on BUSYBOX_ASH +config BUSYBOX_BASH_IS_ASH bool "ash" - depends on !BUSYBOX_NOMMU -config BUSYBOX_FEATURE_BASH_IS_HUSH - depends on BUSYBOX_HUSH +config BUSYBOX_BASH_IS_HUSH bool "hush" -config BUSYBOX_FEATURE_BASH_IS_NONE - bool "none" - endchoice - config BUSYBOX_SH_MATH_SUPPORT bool "POSIX math support" default y -- cgit v1.2.3