changeset 1501:fddd7d20ae72

Collate config entries supplid by toybox at end of baseconfig-busybox, so I can work out a way to switch them off later.
author Rob Landley <rob@landley.net>
date Wed, 14 Mar 2012 06:17:51 -0500
parents 7e918ec092c9
children 14588e923205
files sources/baseconfig-busybox
diffstat 1 files changed, 39 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/sources/baseconfig-busybox	Sat Feb 04 23:20:53 2012 -0600
+++ b/sources/baseconfig-busybox	Wed Mar 14 06:17:51 2012 -0500
@@ -15,7 +15,6 @@
 # needed for old format tar archive (genext2fs)
 CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
 CONFIG_BASENAME=y
-CONFIG_CAT=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
 CONFIG_CP=y
@@ -23,16 +22,11 @@
 CONFIG_DATE=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-CONFIG_DIRNAME=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_ENV=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
 CONFIG_EXPR=y
 CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_ID=y
 CONFIG_INSTALL=y
-CONFIG_LN=y
 CONFIG_LS=y
 # host-tools.sh uses ls -tc to check for tarballs
 CONFIG_FEATURE_LS_SORTFILES=y
@@ -41,36 +35,23 @@
 CONFIG_MKDIR=y
 CONFIG_MV=y
 CONFIG_OD=y
-CONFIG_PWD=y
 CONFIG_READLINK=y
 CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_SHA1SUM=y
 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-CONFIG_SLEEP=y
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
 # stat -c is used by sources/toys/gen_initramfs_list.sh
 CONFIG_STAT=y
 CONFIG_FEATURE_STAT_FORMAT=y
 CONFIG_TAIL=y
 CONFIG_TOUCH=y
 CONFIG_TR=y
-CONFIG_TRUE=y
-CONFIG_UNAME=y
 CONFIG_UNIQ=y
-CONFIG_WC=y
 CONFIG_WHOAMI=y
-CONFIG_YES=y
 CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_MKTEMP=y
-CONFIG_WHICH=y
 CONFIG_AWK=y
-CONFIG_CMP=y
 CONFIG_DIFF=y
 CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_PATCH=y
 CONFIG_SED=y
 CONFIG_FIND=y
 CONFIG_FEATURE_FIND_PRINT0=y
@@ -80,8 +61,6 @@
 CONFIG_FEATURE_FIND_PATH=y
 CONFIG_FEATURE_FIND_MAXDEPTH=y
 CONFIG_GREP=y
-CONFIG_XARGS=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 CONFIG_HOSTNAME=y
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
@@ -89,7 +68,6 @@
 # for root file system use
 CONFIG_INIT=y
 CONFIG_FEATURE_INIT_SCTTY=y
-CONFIG_MDEV=y
 CONFIG_MOUNT=y
 CONFIG_MOUNTPOINT=y
 CONFIG_IFCONFIG=y
@@ -122,22 +100,15 @@
 
 # LFS build
 
-CONFIG_SYNC=y
-CONFIG_HEAD=y
 CONFIG_WGET=y
 CONFIG_CHGRP=y
 CONFIG_COMM=y
 CONFIG_LESS=y
 CONFIG_LOGNAME=y
 CONFIG_SPLIT=y
-CONFIG_TEE=y
 CONFIG_MAN=y
 
 # native-build.sh
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-
 CONFIG_FTPD=y
 CONFIG_FEATURE_FTP_WRITE=y
 CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
@@ -148,7 +119,6 @@
 CONFIG_FEATURE_MOUNT_FLAGS=y
 CONFIG_FEATURE_MOUNT_FSTAB=y
 CONFIG_TAC=y
-CONFIG_CHROOT=y
 CONFIG_SWITCH_ROOT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
 CONFIG_FEATURE_MOUNT_LOOP=y
@@ -172,7 +142,6 @@
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 
-CONFIG_DMESG=y
 CONFIG_PGREP=y
 CONFIG_PKILL=y
 CONFIG_SHOW_USAGE=y
@@ -181,3 +150,41 @@
 
 CONFIG_LSPCI=y
 CONFIG_PING=y
+
+# Stuff in toybox
+CONFIG_CAT=y
+CONFIG_CHROOT=y
+CONFIG_CMP=y
+CONFIG_DIRNAME=y
+CONFIG_DMESG=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+
+CONFIG_ENV=y
+CONFIG_HEAD=y
+CONFIG_ID=y
+CONFIG_LN=y
+
+CONFIG_MDEV=y
+
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+
+CONFIG_PATCH=y
+CONFIG_PWD=y
+CONFIG_RMDIR=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+
+CONFIG_SYNC=y
+CONFIG_TEE=y
+CONFIG_TRUE=y
+CONFIG_UNAME=y
+CONFIG_WC=y
+CONFIG_WHICH=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+CONFIG_YES=y