busybox: add more functionality, pass 1.

While trying to install a difficult system, it became apparent that the
default genkernel busybox was a pain to work with in some cases, and the
netboot busybox hadn't been maintained. The netboot busybox
functionality also adds very little size to busybox, so start to merge
the busybox configurations (meaning default genkernel can be used for
most of netboot).

On amd64, this adds approx 170KiB to the default busybox, and 380KiB to
the netboot busybox (mostly due to not being maintained much).

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

1 files changed, 46 insertions, 46 deletions

diff --git a/netboot/busy-config b/netboot/busy-config
index 2d88403c..d3cfad96 100644
--- a/netboot/busy-config
+++ b/netboot/busy-config
@@ -14,7 +14,7 @@ CONFIG_HAVE_DOT_CONFIG=y
 #
 CONFIG_NITPICK=y
 # CONFIG_DESKTOP is not set
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_SHOW_USAGE=y
@@ -143,7 +143,7 @@ CONFIG_CHMOD=y
 CONFIG_CHOWN=y
 CONFIG_CHROOT=y
 # CONFIG_CKSUM is not set
-# CONFIG_COMM is not set
+CONFIG_COMM=y
 CONFIG_CP=y
 CONFIG_CUT=y
 CONFIG_DATE=y
@@ -164,15 +164,15 @@ CONFIG_ENV=y
 # CONFIG_EXPAND is not set
 # CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
 CONFIG_EXPR=y
-# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FALSE=y
-# CONFIG_FOLD is not set
+CONFIG_FOLD=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_HOSTID is not set
+CONFIG_HOSTID=y
 CONFIG_ID=y
 CONFIG_INSTALL=y
-# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
 CONFIG_LENGTH=y
 CONFIG_LN=y
 # CONFIG_LOGNAME is not set
@@ -187,7 +187,7 @@ CONFIG_FEATURE_LS_COLOR=y
 # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
 CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
-# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
 CONFIG_MKFIFO=y
 CONFIG_MKNOD=y
 CONFIG_MV=y
@@ -212,7 +212,7 @@ CONFIG_FEATURE_SORT_BIG=y
 # CONFIG_SPLIT is not set
 # CONFIG_FEATURE_SPLIT_FANCY is not set
 CONFIG_STAT=y
-# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_FEATURE_STAT_FORMAT=y
 CONFIG_STTY=y
 # CONFIG_SUM is not set
 CONFIG_SYNC=y
@@ -236,7 +236,7 @@ CONFIG_USLEEP=y
 # CONFIG_UUDECODE is not set
 # CONFIG_UUENCODE is not set
 CONFIG_WC=y
-# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_FEATURE_WC_LARGE=y
 # CONFIG_WHO is not set
 CONFIG_WHOAMI=y
 CONFIG_YES=y
@@ -272,10 +272,10 @@ CONFIG_LOADFONT=y
 CONFIG_LOADKMAP=y
 CONFIG_OPENVT=y
 CONFIG_RESET=y
-# CONFIG_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
 CONFIG_SETCONSOLE=y
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
 CONFIG_SETKEYCODES=y
 # CONFIG_SETLOGCONS is not set
 
@@ -284,9 +284,9 @@ CONFIG_SETKEYCODES=y
 #
 CONFIG_MKTEMP=y
 # CONFIG_PIPE_PROGRESS is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
 # CONFIG_START_STOP_DAEMON is not set
 # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
 # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
@@ -295,7 +295,7 @@ CONFIG_WHICH=y
 #
 # Editors
 #
-# CONFIG_AWK is not set
+CONFIG_AWK=y
 # CONFIG_FEATURE_AWK_MATH is not set
 CONFIG_CMP=y
 CONFIG_DIFF=y
@@ -340,7 +340,7 @@ CONFIG_FEATURE_FIND_DEPTH=y
 CONFIG_FEATURE_FIND_PAREN=y
 CONFIG_FEATURE_FIND_SIZE=y
 CONFIG_FEATURE_FIND_PRUNE=y
-# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_DELETE=y
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
@@ -456,7 +456,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_GETOPT is not set
+CONFIG_GETOPT=y
 CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
 # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
@@ -481,7 +481,7 @@ CONFIG_FEATURE_MOUNT_FSTAB=y
 CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
 # CONFIG_READPROFILE is not set
-# CONFIG_SETARCH is not set
+CONFIG_SETARCH=y
 CONFIG_SWAPONOFF=y
 CONFIG_SWITCH_ROOT=y
 CONFIG_UMOUNT=y
@@ -511,7 +511,7 @@ CONFIG_DC=y
 # CONFIG_FEATURE_DEVFS is not set
 # CONFIG_EJECT is not set
 # CONFIG_LAST is not set
-# CONFIG_LESS is not set
+CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=
 # CONFIG_FEATURE_LESS_BRACKETS is not set
 # CONFIG_FEATURE_LESS_FLAGS is not set
@@ -530,8 +530,8 @@ CONFIG_FEATURE_MAKEDEVS_LEAF=y
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
 CONFIG_MOUNTPOINT=y
 CONFIG_MT=y
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
+CONFIG_RAIDAUTORUN=y
+CONFIG_READAHEAD=y
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
 CONFIG_STRINGS=y
@@ -545,7 +545,7 @@ CONFIG_TIME=y
 #
 # Networking Utilities
 #
-# CONFIG_FEATURE_IPV6 is not set
+CONFIG_FEATURE_IPV6=y
 CONFIG_VERBOSE_RESOLUTION_ERRORS=y
 # CONFIG_ARP is not set
 # CONFIG_ARPING is not set
@@ -590,30 +590,30 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
 # CONFIG_FEATURE_INETD_RPC is not set
-# CONFIG_IP is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
-# CONFIG_FEATURE_IP_ROUTE is not set
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_FEATURE_IP_RULE is not set
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_IPRULE is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
 CONFIG_IPCALC=y
 CONFIG_FEATURE_IPCALC_FANCY=y
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
 # CONFIG_NAMEIF is not set
 CONFIG_NC=y
 CONFIG_NC_SERVER=y
-# CONFIG_NC_EXTRA is not set
+CONFIG_NC_EXTRA=y
 CONFIG_NETSTAT=y
-# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_FEATURE_NETSTAT_WIDE=y
 CONFIG_NSLOOKUP=y
 CONFIG_PING=y
-# CONFIG_PING6 is not set
+CONFIG_PING6=y
 # CONFIG_PSCAN is not set
 CONFIG_FEATURE_FANCY_PING=y
 CONFIG_ROUTE=y
@@ -623,10 +623,10 @@ CONFIG_ROUTE=y
 # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
 # CONFIG_TELNETD is not set
 # CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_TFTP is not set
-# CONFIG_FEATURE_TFTP_GET is not set
-# CONFIG_FEATURE_TFTP_PUT is not set
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
 # CONFIG_DEBUG_TFTP is not set
 CONFIG_TRACEROUTE=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
@@ -643,7 +643,7 @@ CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 # CONFIG_ZCIP is not set
 
 #
@@ -661,7 +661,7 @@ CONFIG_FEATURE_PIDOF_OMIT=y
 CONFIG_PS=y
 CONFIG_FEATURE_PS_WIDE=y
 CONFIG_RENICE=y
-# CONFIG_BB_SYSCTL is not set
+CONFIG_BB_SYSCTL=y
 CONFIG_TOP=y
 CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
 CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
@@ -692,7 +692,7 @@ CONFIG_ASH_MATH_SUPPORT=y
 CONFIG_ASH_BUILTIN_ECHO=y
 CONFIG_ASH_BUILTIN_TEST=y
 # CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_MAIL=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_RANDOM_SUPPORT=y
 # CONFIG_ASH_EXPAND_PRMT is not set