X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=busybox.def.h;h=854de1466ca55fa8a26dd03754e9565f6423d2c7;hb=f1f6d58598ae6628b6a31d512e9148674349ee98;hp=afdc46971f24dd444208de827ce82ed0f6217b1f;hpb=cbd0d625c7466af80f141e0ae24186e15987bf3e;p=oweals%2Fbusybox.git

diff --git a/busybox.def.h b/busybox.def.h
index afdc46971..854de1466 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -7,23 +7,28 @@
 //
 //
 // BusyBox Applications
-//#define BB_BASENAME
+#define BB_AR
+#define BB_BASENAME
 #define BB_CAT
 #define BB_CHMOD_CHOWN_CHGRP
 #define BB_CHROOT
 #define BB_CHVT
 #define BB_CLEAR
 #define BB_CP_MV
+#define BB_CUT
 #define BB_DATE
+#define BB_DC
 #define BB_DD
 #define BB_DEALLOCVT
 #define BB_DF
 #define BB_DIRNAME
 #define BB_DMESG
-//#define BB_DUTMP
+#define BB_DUTMP
 #define BB_DU
+#define BB_DUMPKMAP
+#define BB_ECHO
 #define BB_FBSET
-//#define BB_FDFLUSH
+#define BB_FDFLUSH
 #define BB_FIND
 #define BB_FREE
 #define BB_FREERAMDISK
@@ -31,52 +36,49 @@
 #define BB_GREP
 #define BB_GUNZIP
 #define BB_GZIP
-//#define BB_HALT
+#define BB_HALT
 #define BB_HEAD
-//#define BB_HOSTID
+#define BB_HOSTID
 #define BB_HOSTNAME
+#define BB_ID
 #define BB_INIT
-// Don't turn BB_INSMOD on.  It doesn't work.
-//#define BB_INSMOD
+#define BB_INSMOD
 #define BB_KILL
-#ifdef BB_KILL
 #define BB_KILLALL
-#endif
-#define BB_KLOGD
-//#define BB_LENGTH
+#define BB_LENGTH
 #define BB_LN
-//#define BB_LOADACM
-//#define BB_LOADFONT
-//#define BB_LOADKMAP
-//#define BB_LOGGER
+#define BB_LOADACM
+#define BB_LOADFONT
+#define BB_LOADKMAP
+#define BB_LOGGER
 #define BB_LOGNAME
 #define BB_LS
 #define BB_LSMOD
-//#define BB_MAKEDEVS
-#define BB_MKFS_MINIX
-//#define BB_MATH
+#define BB_MAKEDEVS
+#define BB_MD5SUM
 #define BB_MKDIR
-//#define BB_MKFIFO
+#define BB_MKFIFO
+#define BB_MKFS_MINIX
 #define BB_MKNOD
 #define BB_MKSWAP
-//#define BB_MNC
+#define BB_MKTEMP
+#define BB_NC
 #define BB_MORE
 #define BB_MOUNT
-#define BB_NFSMOUNT
-//#define BB_MT
+#define BB_MT
 #define BB_NSLOOKUP
 #define BB_PING
 #define BB_POWEROFF
-//#define BB_PRINTF
+#define BB_PRINTF
 #define BB_PS
 #define BB_PWD
 #define BB_REBOOT
-#define BB_REGEXP
 #define BB_RM
 #define BB_RMDIR
-//#define BB_RMMOD
+#define BB_RMMOD
 #define BB_SED
-//#define BB_SFDISK
+#define BB_SETKEYCODES
+#define BB_SH
 #define BB_SLEEP
 #define BB_SORT
 #define BB_SWAPONOFF
@@ -85,15 +87,19 @@
 #define BB_TAIL
 #define BB_TAR
 #define BB_TEE
-// Don't turn BB_TELNET on.  It doesn't work.
+#define BB_TEST
 #define BB_TELNET
 #define BB_TOUCH
 #define BB_TR
 #define BB_TRUE_FALSE
 #define BB_TTY
 #define BB_UPTIME
+#define BB_USLEEP
 #define BB_WC
+#define BB_WHICH
 #define BB_WHOAMI
+#define BB_UUENCODE
+#define BB_UUDECODE
 #define BB_UMOUNT
 #define BB_UNIQ
 #define BB_UNAME
@@ -103,25 +109,42 @@
 //
 //
 //
-//
+// ---------------------------------------------------------
 // This is where feature definitions go.  Generally speaking,
 // turning this stuff off makes things a bit smaller (and less 
 // pretty/useful).
 //
 //
-// Turn this on to use Erik's very cool devps, devmtab, 
-// etc. kernel drivers, thereby eliminating the need for 
-// the /proc filesystem and thereby saving lots and lots 
-// memory for more important things.
-// You can't use this and USE_PROCFS at the same time...
-//#define BB_FEATURE_USE_DEVPS_N_DEVMTAB
 //
+// Turn this on to use Erik's very cool devps, devmtab, etc kernel drivers,
+// thereby eliminating the need for the /proc filesystem and thereby saving
+// lots and lots memory for more important things.  You can not use this and
+// USE_PROCFS at the same time...  NOTE:  If you enable this feature, you
+// _must_ have patched the kernel to include the devps patch that is included
+// in the busybox/kernel-patches directory.  You will also need to create some
+// device special files /dev on your embedded system:
+//        mknod /dev/modules c 10 23
+//        mknod /dev/mtab c 10 22
+//        mknod /dev/ps c 10 21
+// I emailed Linus and this patch will not be going into the stock kernel.
+//#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
 //
+// 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
+//
+// This compiles out everything but the most 
+// trivial --help usage information (i.e. reduces binary size)
+//#define BB_FEATURE_TRIVIAL_HELP
+//
 // Use termios to manipulate the screen ('more' is prettier with this on)
 #define BB_FEATURE_USE_TERMIOS
 //
@@ -129,23 +152,39 @@
 #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
+//
+// enable ls -R
+#define BB_FEATURE_LS_RECURSIVE
 //
 // Change ping implementation -- simplified, featureless, but really small.
-//#define BB_SIMPLE_PING
-////
+//#define BB_FEATURE_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
 //
+//Have init enable core dumping for child processes (for debugging only) 
+//#define BB_FEATURE_INIT_COREDUMPS
+//
+// 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
+//#define BB_FEATURE_INIT_CHROOT
+//
+//Make sure nothing is printed to the console on boot
+#define BB_FEATURE_EXTRA_QUIET
+//
+//Should syslogd also provide klogd support?
+#define BB_FEATURE_KLOGD
 //
 //Simple tail implementation (2k vs 6k for the full one).  Still
 //provides 'tail -f' support -- but for only one file at a time.
@@ -155,27 +194,118 @@
 #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 mounting remote NFS volumes
+// (This does not yet work with Linux 2.[34].x kernels)
+#define BB_FEATURE_NFSMOUNT
 //
-// Enable support for remounting filesystems
-#define BB_FEATURE_REMOUNT
+// Enable support forced filesystem unmounting 
+// (i.e. in case of an unreachable NFS system).
+#define BB_FEATURE_MOUNT_FORCE
 //
 // Enable support for creation of tar files.
-//#define BB_FEATURE_TAR_CREATE
+#define BB_FEATURE_TAR_CREATE
+//
+// Enable support for "--exclude" for excluding files
+#define BB_FEATURE_TAR_EXCLUDE
 //
 //// Enable reverse sort
-//#define BB_FEATURE_SORT_REVERSE
+#define BB_FEATURE_SORT_REVERSE
 //
-// 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
+// Enable command line editing in the shell
+#define BB_FEATURE_SH_COMMAND_EDITING
+//
+//Allow the shell to invoke all the compiled in BusyBox commands as if they
+//were shell builtins.  Nice for staticly linking an emergency rescue shell
+//amoung other thing.
+#define BB_FEATURE_SH_STANDALONE_SHELL
+//
+// Enable tab completion in the shell (not yet 
+// working very well -- so don't turn this on)
+//#define BB_FEATURE_SH_TAB_COMPLETION
+//
+//Turn on extra fbset options
+//#define BB_FEATURE_FBSET_FANCY
+//
+//Turn on fbset readmode support
+//#define BB_FEATURE_FBSET_READMODE
+//
+// You must enable one or both of these features
+// Support installing modules from pre 2.1 kernels
+//#define BB_FEATURE_INSMOD_OLD_KERNEL
+// Support installing modules from kernel versions after 2.1.18
+#define BB_FEATURE_INSMOD_NEW_KERNEL
+//
+// Support module version checking
+//#define BB_FEATURE_INSMOD_VERSION_CHECKING
+//
+//
+// Enable busybox --install [-s]
+// to create links (or symlinks) for all the commands that are 
+// compiled into the binary.  (needs /proc filesystem)
+// #define BB_FEATURE_INSTALLER
+//
+// 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
 //
-//Make sure nothing is printed to the console on boot
-#define BB_FEATURE_EXTRA_QUIET
-
+#if defined BB_FEATURE_FULL_REGULAR_EXPRESSIONS && (defined BB_SED || defined BB_GREP )
+#define BB_REGEXP
+#endif
+//
+#if defined BB_FEATURE_SH_COMMAND_EDITING && defined BB_SH
+#define BB_CMDEDIT
+#endif
+//
+#ifdef BB_KILLALL
+#ifndef BB_KILL
+#define BB_KILL
+#endif
+#endif
+//
+#ifdef BB_FEATURE_LINUXRC
+#ifndef BB_INIT
+#define BB_INIT
+#define BB_LINUXRC
+#endif
+#endif
+//
+#ifdef BB_GZIP
+#ifndef BB_GUNZIP
+#define BB_GUNZIP
+#endif
+#endif
+//
+#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
+#define BB_NFSMOUNT
+#endif
+//
+#if defined BB_FEATURE_SH_COMMAND_EDITING
+#ifndef BB_FEATURE_USE_TERMIOS
+#define BB_FEATURE_USE_TERMIOS
+#endif
+#endif
+//
+#if defined BB_FEATURE_AUTOWIDTH
+#ifndef BB_FEATURE_USE_TERMIOS
+#define BB_FEATURE_USE_TERMIOS
+#endif
+#endif
+//
+#if defined BB_INSMOD
+#ifndef BB_FEATURE_INSMOD_OLD_KERNEL
+#define BB_FEATURE_INSMOD_NEW_KERNEL
+#endif
+#endif