Major build system updates...

 -Erik

1 files changed, 50 insertions, 24 deletions

diff --git a/busybox.def.h b/busybox.def.h
index 0caa57380..d78a0efe8 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -22,13 +22,14 @@
 #define BB_DMESG
 //#define BB_DUTMP
 #define BB_DU
-#define BB_FBSET
+#define BB_ECHO
+//#define BB_FBSET
 //#define BB_FDFLUSH
 #define BB_FIND
 #define BB_FREE
-#define BB_FREERAMDISK
-#define BB_FSCK_MINIX
-#define BB_GREP
+//#define BB_FREERAMDISK
+//#define BB_FSCK_MINIX
+//#define BB_GREP
 #define BB_GUNZIP
 #define BB_GZIP
 //#define BB_HALT
@@ -36,12 +37,9 @@
 //#define BB_HOSTID
 #define BB_HOSTNAME
 #define BB_INIT
-// Don't turn BB_INSMOD on.  It doesn't work.
+// Don't bother turning BB_INSMOD on.  It doesn't work.
 //#define BB_INSMOD
 #define BB_KILL
-#ifdef BB_KILL
-#define BB_KILLALL
-#endif
 #define BB_KLOGD
 //#define BB_LENGTH
 #define BB_LN
@@ -53,7 +51,7 @@
 #define BB_LS
 //#define BB_LSMOD
 //#define BB_MAKEDEVS
-#define BB_MKFS_MINIX
+//#define BB_MKFS_MINIX
 //#define BB_MATH
 #define BB_MKDIR
 //#define BB_MKFIFO
@@ -62,7 +60,7 @@
 //#define BB_MNC
 #define BB_MORE
 #define BB_MOUNT
-#define BB_NFSMOUNT
+//#define BB_NFSMOUNT
 //#define BB_MT
 #define BB_NSLOOKUP
 #define BB_PING
@@ -71,7 +69,6 @@
 #define BB_PS
 #define BB_PWD
 #define BB_REBOOT
-#define BB_REGEXP
 #define BB_RM
 #define BB_RMDIR
 //#define BB_RMMOD
@@ -86,6 +83,7 @@
 #define BB_TAIL
 #define BB_TAR
 #define BB_TEE
+#define BB_TEST
 // Don't turn BB_TELNET on.  It doesn't work.
 #define BB_TELNET
 #define BB_TOUCH
@@ -104,7 +102,7 @@
 //
 //
 //
-//
+// ---------------------------------------------------------
 // This is where feature definitions go.  Generally speaking,
 // turning this stuff off makes things a bit smaller (and less 
 // pretty/useful).
@@ -117,10 +115,10 @@
 // You can't use this and USE_PROCFS at the same time...
 //#define BB_FEATURE_USE_DEVPS_PATCH
 //
-//
 // enable features that use the /proc filesystem (apps that 
 // break without this will tell you on compile)...
-// You can't use this and DEVPS_N_DEVMTAB at the same time...
+// You can't use this and BB_FEATURE_USE_DEVPS_PATCH 
+// at the same time...
 #define BB_FEATURE_USE_PROCFS
 //
 // Use termios to manipulate the screen ('more' is prettier with this on)
@@ -130,24 +128,23 @@
 #define BB_FEATURE_AUTOWIDTH
 //
 // show username/groupnames (bypasses libc6 NSS) for ls
-#define BB_FEATURE_LS_USERNAME	
+#define BB_FEATURE_LS_USERNAME
 //
 // show file timestamps in ls
 #define BB_FEATURE_LS_TIMESTAMPS
 //
 // enable ls -p and -F
-#define BB_FEATURE_LS_FILETYPES	
+#define BB_FEATURE_LS_FILETYPES
 //
 // Change ping implementation -- simplified, featureless, but really small.
 //#define BB_SIMPLE_PING
-////
+//
 // Make init use a simplified /etc/inittab file (recommended).
 #define BB_FEATURE_USE_INITTAB
 //
 //Enable init being called as /linuxrc
 //#define BB_FEATURE_LINUXRC
 //
-//
 //Simple tail implementation (2k vs 6k for the full one).  Still
 //provides 'tail -f' support -- but for only one file at a time.
 #define BB_FEATURE_SIMPLE_TAIL
@@ -156,9 +153,7 @@
 #define BB_FEATURE_MOUNT_LOOP
 //
 // Enable support for a real /etc/mtab file instead of /proc/mounts
-#ifdef BB_MOUNT
-//#define BB_MTAB
-#endif
+//#define BB_FEATURE_MOUNT_MTAB_SUPPORT
 //
 //
 // Enable support for remounting filesystems
@@ -173,10 +168,41 @@
 // Allow init to permenently chroot, and umount the old root fs
 // just like an initrd does.  Requires a kernel patch by Werner Almesberger. 
 // ftp://icaftp.epfl.ch/pub/people/almesber/misc/umount-root-*.tar.gz
-#ifdef BB_MOUNT
 //#define BB_FEATURE_INIT_CHROOT
-#endif
 //
 //Make sure nothing is printed to the console on boot
 #define BB_FEATURE_EXTRA_QUIET
-
+//
+// Enable full regular expressions.  This adds about 
+// 4k.  When this is off, things that would normally
+// use regualr expressions (like grep) will just use
+// normal strings.
+#define BB_FEATURE_FULL_REGULAR_EXPRESSIONS
+//
+//
+// Enable command line editing in the shell
+#define BB_FEATURE_SH_COMMAND_EDITING
+//
+//
+// End of Features List
+//
+//
+//
+//
+//
+//
+//---------------------------------------------------
+// Nothing beyond this point should ever be touched by 
+// mere mortals so leave this stuff alone.
+#ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
+#define BB_MTAB
+#endif
+//
+#ifdef BB_FEATURE_FULL_REGULAR_EXPRESSIONS
+#define BB_REGEXP
+#endif
+//
+#ifdef BB_FEATURE_SH_COMMAND_EDITING
+#define BB_CMDEDIT
+#endif
+//