Update busybox configuration mechanism. Support building busybox unstable

 -Erik

4 files changed, 977 insertions, 256 deletions

diff --git a/make/busybox.mk b/make/busybox.mk
index f66823e26..39a53611f 100644
--- a/make/busybox.mk
+++ b/make/busybox.mk
@@ -7,33 +7,40 @@
 ifeq ($(USE_BUSYBOX_SNAPSHOT),true)
 # Be aware that this changes daily....
 BUSYBOX_DIR:=$(BUILD_DIR)/busybox
-BUSYBOX_SOURCE=busybox-snapshot.tar.bz2
-BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
+BUSYBOX_SOURCE=busybox-unstable.tar.bz2
+BUSYBOX_SITE:=ftp://ftp.busybox.net/busybox/snapshots
 BUSYBOX_UNZIP=bzcat
-BUSYBOX_PATCH:=$(SOURCE_DIR)/busybox.patch
+BUSYBOX_CONFIG:=$(SOURCE_DIR)/busybox.config
 else
 BUSYBOX_DIR:=$(BUILD_DIR)/busybox-0.60.5
 BUSYBOX_SOURCE:=busybox-0.60.5.tar.bz2
-BUSYBOX_SITE:=http://www.busybox.net/downloads
+BUSYBOX_SITE:=ftp://ftp.busybox.net/busybox
 BUSYBOX_UNZIP=bzcat
-BUSYBOX_PATCH:=$(SOURCE_DIR)/busybox.patch
+BUSYBOX_CONFIG:=$(SOURCE_DIR)/busybox.Config.h
 endif
 
 $(DL_DIR)/$(BUSYBOX_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
 
-busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH)
+busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG)
 
-$(BUSYBOX_DIR)/.configured: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH)
+$(BUSYBOX_DIR)/.configured: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG)
 	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	if [ -n "$(BUSYBOX_PATCH)" ] ; then \
-	cat $(BUSYBOX_PATCH) | patch -d $(BUSYBOX_DIR) -p1; fi
+ifeq ($(USE_BUSYBOX_SNAPSHOT),true)
+	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config
+	perl -i -p -e "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
+		PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
+ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
+	perl -i -p -e "s/^.*DOLFS.*/DOLFS=y/;" $(BUSYBOX_DIR)/.config
+endif
+else  # Not usine snapshot
+	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/Config.h
 	perl -i -p -e "s,^CROSS.*,CROSS=$(TARGET_CROSS),;" $(BUSYBOX_DIR)/Makefile
 	perl -i -p -e "s,^PREFIX.*,PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Makefile
-	perl -i -p -e "s/^MD5SUM_SIZE_VS_SPEED.*/MD5SUM_SIZE_VS_SPEED 0/;" $(BUSYBOX_DIR)/md5sum.c
 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
 	perl -i -p -e "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile
 endif
+endif
 	touch $(BUSYBOX_DIR)/.configured
 
 busybox-unpack: $(BUSYBOX_DIR)/.configured
diff --git a/sources/busybox.Config.h b/sources/busybox.Config.h
new file mode 100644
index 000000000..48bb0e000
--- /dev/null
+++ b/sources/busybox.Config.h
@@ -0,0 +1,495 @@
+/* vi: set sw=4 ts=4: */
+// This file defines the feature set to be compiled into busybox.
+// When you turn things off here, they won't be compiled in at all.
+//
+//// This file is parsed by sed.  You MUST use single line comments.
+//   i.e.,  //#define BB_BLAH
+//
+//
+// BusyBox Applications
+//#define BB_ADJTIMEX
+#define BB_AR
+#define BB_ASH
+#define BB_BASENAME
+#define BB_CAT
+#define BB_CHGRP
+#define BB_CHMOD
+#define BB_CHOWN
+#define BB_CHROOT
+#define BB_CHVT
+#define BB_CLEAR
+#define BB_CMP
+#define BB_CP
+#define BB_CPIO
+#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_DOS2UNIX
+//#define BB_DPKG
+//#define BB_DPKG_DEB
+//#define BB_DUTMP
+#define BB_DU
+//#define BB_DUMPKMAP
+#define BB_ECHO
+#define BB_ENV
+#define BB_EXPR
+#define BB_FBSET
+//#define BB_FDFLUSH
+#define BB_FIND
+#define BB_FREE
+#define BB_FREERAMDISK
+//#define BB_FSCK_MINIX
+//#define BB_GETOPT
+#define BB_GREP
+#define BB_GUNZIP
+#define BB_GZIP
+#define BB_HALT
+#define BB_HEAD
+#define BB_HOSTID
+#define BB_HOSTNAME
+//#define BB_HUSH
+#define BB_ID
+#define BB_IFCONFIG
+#define BB_INIT
+#define BB_INSMOD
+#define BB_KILL
+#define BB_KILLALL
+#define BB_KLOGD
+//#define BB_LASH
+//#define BB_LENGTH
+#define BB_LN
+//#define BB_LOADACM
+//#define BB_LOADFONT
+//#define BB_LOADKMAP
+#define BB_LOGGER
+#define BB_LOGNAME
+#define BB_LOSETUP
+#define BB_LS
+#define BB_LSMOD
+//#define BB_MAKEDEVS
+#define BB_MD5SUM
+#define BB_MKDIR
+//#define BB_MKFIFO
+//#define BB_MKFS_MINIX
+#define BB_MKNOD
+#define BB_MKSWAP
+#define BB_MKTEMP
+#define BB_MODPROBE
+#define BB_MORE
+#define BB_MOUNT
+//#define BB_MSH
+//#define BB_MT
+#define BB_MV
+#define BB_NC
+#define BB_NSLOOKUP
+#define BB_PIDOF
+#define BB_PING
+#define BB_PIVOT_ROOT
+#define BB_POWEROFF
+#define BB_PRINTF
+#define BB_PS
+#define BB_PWD
+#define BB_RDATE
+#define BB_READLINK
+#define BB_REBOOT
+//#define BB_RENICE
+#define BB_RESET
+#define BB_RM
+#define BB_RMDIR
+#define BB_RMMOD
+#define BB_ROUTE
+//#define BB_RPM2CPIO
+#define BB_SED
+//#define BB_SETKEYCODES
+#define BB_SLEEP
+#define BB_SORT
+#define BB_STRINGS
+#define BB_STTY
+#define BB_SWAPONOFF
+#define BB_SYNC
+#define BB_SYSLOGD
+#define BB_TAIL
+#define BB_TAR
+#define BB_TEE
+#define BB_TEST
+#define BB_TELNET
+#define BB_TFTP
+#define BB_TIME
+#define BB_TOP
+#define BB_TOUCH
+#define BB_TR
+#define BB_TRACEROUTE
+#define BB_TRUE_FALSE
+#define BB_TTY
+//#define BB_UNIX2DOS
+#define BB_UUENCODE
+#define BB_UUDECODE
+#define BB_UMOUNT
+#define BB_UNIQ
+#define BB_UNAME
+//#define BB_UPDATE
+#define BB_UPTIME
+#define BB_USLEEP
+#define BB_VI
+//#define BB_WATCHDOG
+#define BB_WC
+#define BB_WGET
+#define BB_WHICH
+#define BB_WHOAMI
+#define BB_XARGS
+#define BB_YES
+// End of Applications List
+//
+//
+//
+// ---------------------------------------------------------
+// This is where feature definitions go.  Generally speaking,
+// turning this stuff off makes things a bit smaller (and less 
+// pretty/useful).
+//
+//
+// If you enabled one or more of the shells, you may select which one
+// should be run when sh is invoked:
+#define BB_FEATURE_SH_IS_ASH
+//#define BB_FEATURE_SH_IS_HUSH
+//#define BB_FEATURE_SH_IS_LASH
+//#define BB_FEATURE_SH_IS_MSH
+//
+// BusyBox will, by default, malloc space for its buffers.  This costs code
+// size for the call to xmalloc.  You can use the following feature to have
+// them put on the stack.  For some very small machines with limited stack
+// space, this can be deadly.  For most folks, this works just fine...
+//#define BB_FEATURE_BUFFERS_GO_ON_STACK
+// The third alternative for buffer allocation is to use BSS.  This works
+// beautifully for computers with a real MMU (and OS support), but wastes
+// runtime RAM for uCLinux.  This behavior was the only one available for
+// BusyBox versions 0.48 and earlier.
+//#define BB_FEATURE_BUFFERS_GO_IN_BSS
+//
+// Turn this on to use Erik's very cool devps, and devmtab kernel drivers,
+// thereby eliminating the need for the /proc filesystem and thereby saving
+// lots and lots memory for more important things.  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 in /dev on your embedded system:
+//        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
+//
+// show verbose usage messages
+#define BB_FEATURE_VERBOSE_USAGE
+//
+// Use termios to manipulate the screen ('more' is prettier with this on)
+#define BB_FEATURE_USE_TERMIOS
+//
+// calculate terminal & column widths (for more, ls, and telnet)
+#define BB_FEATURE_AUTOWIDTH
+//
+// show username/groupnames for ls
+#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
+//
+// sort the file names
+#define BB_FEATURE_LS_SORTFILES
+//
+// enable ls -R
+#define BB_FEATURE_LS_RECURSIVE
+//
+// enable ls -L
+#define BB_FEATURE_LS_FOLLOWLINKS
+//
+// Use color to identify different file types
+#define BB_FEATURE_LS_COLOR
+//
+// Disable for a smaller (but less functional) ping
+#define BB_FEATURE_FANCY_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
+//
+//Make sure nothing is printed to the console on boot
+#define BB_FEATURE_EXTRA_QUIET
+//
+// enable syslogd -R remotehost
+//#define BB_FEATURE_REMOTE_LOG
+//
+// enable syslogd -C
+//#define BB_FEATURE_IPC_SYSLOG
+//
+//Disable for a simple tail implementation (2.34k vs 3k for the full one).
+//Both provide 'tail -f', but this cuts out -c, -q, -s, and -v. 
+#define BB_FEATURE_FANCY_TAIL
+//
+// Enable support for loop devices in mount
+#define BB_FEATURE_MOUNT_LOOP
+//
+// Enable support for a real /etc/mtab file instead of /proc/mounts
+//#define BB_FEATURE_MTAB_SUPPORT
+//
+// Enable support for mounting remote NFS volumes. 
+// You may need to mount with "-o nolock" if you are
+// not running a local portmapper daemon...
+//
+// If you are using uClibc, be sure that you've already compiled
+// uClibc with INCLUDE_RPC=true (contained in the Config file)
+//#define BB_FEATURE_NFSMOUNT
+//
+// 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
+//
+// Enable support for "--exclude" and "-X" for excluding files
+#define BB_FEATURE_TAR_EXCLUDE
+//
+// Enable support for tar -z option (currently only works for inflating)
+#define BB_FEATURE_TAR_GZIP 
+//
+// Enable reverse sort
+#define BB_FEATURE_SORT_REVERSE
+//
+// Enable uniqe sort
+#define BB_FEATURE_SORT_UNIQUE
+//
+// Enable command line editing in the shell.  
+// Only relevant if a shell is enabled. On by default.
+#define BB_FEATURE_COMMAND_EDITING
+//
+// Enable tab completion in the shell.  This is now working quite nicely.
+// This feature adds a bit over 4k. Only relevant if a shell is enabled.
+#define BB_FEATURE_COMMAND_TAB_COMPLETION
+//
+// Attempts to match usernames in a ~-prefixed path
+#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
+//
+//Allow the shell to invoke all the compiled in BusyBox applets as if they
+//were shell builtins.  Nice for staticly linking an emergency rescue shell,
+//among other things. Off by default.
+// Only relevant if a shell is enabled.
+//#define BB_FEATURE_SH_STANDALONE_SHELL
+//
+//When this is enabled, busybox shell applets can be called using full path
+//names.  This causes applets (i.e., most busybox commands) to override
+//real commands on the filesystem.  For example, if you run run /bin/cat, it
+//will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_
+//busybox.  Some systems want this, others do not.  Choose wisely.  :-) This
+//only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled.
+// Only relevant if a shell is enabled. Off by default.
+//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+//
+// Uncomment this option for a fancy shell prompt that includes the
+// current username and hostname.  On systems that don't have usernames
+// or hostnames, this can look hideous.
+// Only relevant if a shell is enabled.
+#define BB_FEATURE_SH_FANCY_PROMPT
+//
+// Uncomment this option to disable job control.  Job control lets you 
+// run jobs in the background (which completely useless for is all you 
+// are doing is running scripts).  Disabing this is bad for interactive
+// use, since when you hit ^C in an application, it will also kill the 
+// shell.  This adds about 2.5k on an x86 system.
+#define BB_FEATURE_ASH_JOB_CONTROL
+//
+//Turn on extra fbset options
+//#define BB_FEATURE_FBSET_FANCY
+//
+//Turn on fbset readmode support
+//#define BB_FEATURE_FBSET_READMODE
+//
+// Support insmod/lsmod/rmmod for post 2.1 kernels
+#define BB_FEATURE_NEW_MODULE_INTERFACE
+//
+// Support insmod/lsmod/rmmod for pre 2.1 kernels
+//#define BB_FEATURE_OLD_MODULE_INTERFACE
+//
+// Support module version checking
+//#define BB_FEATURE_INSMOD_VERSION_CHECKING
+//
+// Support for uClinux memory usage optimization, which will load the image
+// directly into the kernel memory.  This divides memory requrements by three.
+// If you are not running uClinux (i.e., your CPU has an MMU) leave this
+// disabled...
+//#define BB_FEATURE_INSMOD_LOADINKMEM
+//
+// Support for Minix filesystem, version 2
+//#define BB_FEATURE_MINIX2
+//
+// Enable ifconfig status reporting output -- this feature adds 7k.
+#define BB_FEATURE_IFCONFIG_STATUS
+//
+// Enable ifconfig slip-specific options "keepalive" and "outfill"
+//#define BB_FEATURE_IFCONFIG_SLIP
+//
+// Enable ifconfig options "mem_start", "io_addr", and "irq".
+#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
+//
+// Enable ifconfig option "hw".  Currently works for only with "ether".
+#define BB_FEATURE_IFCONFIG_HW
+//
+// Allows "broadcast +" to set broadcast automatically based on hostaddr
+// and netmask, at a cost of about 100 bytes of code (i386).
+//#define BB_FEATURE_IFCONFIG_BROADCAST_PLUS
+//
+// 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
+//
+// Enable a nifty progress meter in wget (adds just under 2k)
+#define BB_FEATURE_WGET_STATUSBAR
+//
+// Enable HTTP authentication in wget
+#define BB_FEATURE_WGET_AUTHENTICATION
+//
+// Clean up all memory before exiting -- usually not needed
+// as the OS can clean up...  Don't enable this unless you
+// have a really good reason for cleaning things up manually.
+//#define BB_FEATURE_CLEAN_UP
+//
+// Support for human readable output by ls, du, etc.(example 13k, 23M, 235G)
+#define BB_FEATURE_HUMAN_READABLE
+//
+// Support for the find -type option.
+#define BB_FEATURE_FIND_TYPE
+//
+// Support for the find -perm option.
+#define BB_FEATURE_FIND_PERM
+//
+// Support for the find -mtime option.
+#define BB_FEATURE_FIND_MTIME
+//
+//// Support for the find -newer option.
+#define BB_FEATURE_FIND_NEWER
+//
+// Support for the -A -B and -C context flags in grep
+#define BB_FEATURE_GREP_CONTEXT
+//
+// Support for the EGREP applet (alias to the grep applet)
+//#define BB_FEATURE_GREP_EGREP_ALIAS
+//
+// Tell tftp what commands that should be supported.
+#define BB_FEATURE_TFTP_PUT
+#define BB_FEATURE_TFTP_GET
+//
+// features for vi
+#define BB_FEATURE_VI_COLON		// ":" colon commands, no "ex" mode
+#define BB_FEATURE_VI_YANKMARK		// Yank/Put commands and Mark cmds
+#define BB_FEATURE_VI_SEARCH		// search and replace cmds
+#define BB_FEATURE_VI_USE_SIGNALS	// catch signals
+#define BB_FEATURE_VI_DOT_CMD		// remember previous cmd and "." cmd
+#define BB_FEATURE_VI_READONLY		// vi -R and "view" mode
+#define BB_FEATURE_VI_SETOPTS		// set-able options,  ai ic showmatch
+#define BB_FEATURE_VI_SET		// :set
+#define BB_FEATURE_VI_WIN_RESIZE	// handle window resize
+//
+// Enable a if you system have setuped locale
+//#define BB_LOCALE_SUPPORT
+//
+// Support for TELNET to pass TERM type to remote host.  Adds 384 bytes.
+#define BB_FEATURE_TELNET_TTYPE
+//
+// Support for devfs.
+//#define BB_FEATURE_DEVFS
+//
+// End of Features List
+//
+//
+//
+//
+//
+//
+//---------------------------------------------------
+// Nothing beyond this point should ever be touched by 
+// mere mortals so leave this stuff alone.
+//
+#include <features.h>
+#if defined(__uClinux__)
+	#undef BB_ASH			/* Not even a chance it will work */
+	#undef BB_RPM2CPIO		/* Uses gz_open(), which uses fork() */
+	#undef BB_DPKG_DEB		/* Uses gz_open(), which uses fork() */
+	#undef BB_FEATURE_TAR_GZIP	/* Uses fork() */
+	#undef BB_UPDATE		/* Uses daemon() */
+#endif
+#if defined BB_ASH || defined BB_HUSH || defined BB_LASH || defined BB_MSH
+	#if defined BB_FEATURE_COMMAND_EDITING
+		#define BB_CMDEDIT
+	#else
+		#undef BB_FEATURE_COMMAND_EDITING
+		#undef BB_FEATURE_COMMAND_TAB_COMPLETION
+		#undef BB_FEATURE_COMMAND_USERNAME_COMPLETION
+		#undef BB_FEATURE_SH_FANCY_PROMPT
+	#endif
+#else
+	#undef BB_FEATURE_SH_APPLETS_ALWAYS_WIN
+	#undef BB_FEATURE_SH_STANDALONE_SHELL
+	#undef BB_FEATURE_SH_FANCY_PROMPT
+#endif
+//
+#if (defined BB_ASH || defined BB_HUSH || defined BB_MSH) && ! defined BB_TEST
+	#define BB_TEST
+#endif
+//
+#ifdef BB_KILLALL
+	#ifndef BB_KILL
+		#define BB_KILL
+	#endif
+#endif
+//
+#ifndef BB_INIT
+	#undef BB_FEATURE_LINUXRC
+#endif
+//
+#if defined BB_MOUNT && defined BB_FEATURE_NFSMOUNT
+	#define BB_NFSMOUNT
+#endif
+//
+#if defined BB_FEATURE_AUTOWIDTH
+	#ifndef BB_FEATURE_USE_TERMIOS
+		#define BB_FEATURE_USE_TERMIOS
+	#endif
+#endif
+//
+#if defined BB_INSMOD || defined BB_LSMOD
+	#if ! defined BB_FEATURE_NEW_MODULE_INTERFACE && ! defined BB_FEATURE_OLD_MODULE_INTERFACE
+		#define BB_FEATURE_NEW_MODULE_INTERFACE
+	#endif
+#endif
+//
+#ifdef BB_UNIX2DOS
+	#define BB_DOS2UNIX
+#endif	
+//
+#ifdef BB_SYSLOGD
+	#if defined BB_FEATURE_IPC_SYSLOG
+		#define BB_LOGREAD
+	#endif
+#endif
+//
+#if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH
+# define shell_main ash_main
+#elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH
+# define shell_main hush_main
+#elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH
+# define shell_main lash_main
+#elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH
+# define shell_main msh_main
+#endif
diff --git a/sources/busybox.config b/sources/busybox.config
new file mode 100644
index 000000000..e2bd5bf22
--- /dev/null
+++ b/sources/busybox.config
@@ -0,0 +1,465 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# General Configuration
+#
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_FEATURE_DEVFS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SUID is not set
+
+#
+# Build Options
+#
+DOSTATIC=y
+DOLFS=y
+# USING_CROSS_COMPILER is not set
+EXTRA_CFLAGS_OPTIONS=""
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+CONFIG_DPKG=y
+CONFIG_DPKG_DEB=y
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_FEATURE_DEB_TAR_GZ=y
+CONFIG_FEATURE_DEB_TAR_BZ2=y
+CONFIG_GUNZIP=y
+CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
+CONFIG_GZIP=y
+CONFIG_RPM2CPIO=y
+CONFIG_RPM=y
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+CONFIG_FEATURE_TAR_EXCLUDE=y
+CONFIG_FEATURE_TAR_GZIP=y
+CONFIG_FEATURE_TAR_OLD_FORMAT=y
+CONFIG_FEATURE_GNUTAR_LONG_FILENAME=y
+CONFIG_FEATURE_UNARCHIVE_TAPE=y
+CONFIG_UNCOMPRESS=y
+CONFIG_UNZIP=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_LOADACM=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_SETKEYCODES=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_READLINK=y
+CONFIG_RUN_PARTS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# File Utilities
+#
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHGRP=y
+CONFIG_CP=y
+CONFIG_DD=y
+CONFIG_DF=y
+CONFIG_DU=y
+CONFIG_LN=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_MKDIR=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SYNC=y
+CONFIG_TOUCH=y
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls and more
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+CONFIG_HALT=y
+CONFIG_POWEROFF=y
+CONFIG_REBOOT=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_USE_BB_PWD_GRP=y
+CONFIG_ADDGROUP=y
+CONFIG_DELGROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_LOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_SU=y
+CONFIG_FEATURE_SHADOWPASSWDS=y
+CONFIG_USE_BB_SHADOW=y
+CONFIG_SULOGIN=y
+CONFIG_VLOCK=y
+
+#
+# Miscellaneous Utilities
+#
+CONFIG_ADJTIMEX=y
+CONFIG_CROND=y
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+CONFIG_DUTMP=y
+CONFIG_MAKEDEVS=y
+CONFIG_MT=y
+CONFIG_STRINGS=y
+CONFIG_TIME=y
+CONFIG_UPDATE=y
+CONFIG_WATCHDOG=y
+
+#
+# Module Utilities
+#
+# CONFIG_INSMOD is not set
+# CONFIG_LSMOD is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_RMMOD is not set
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+# CONFIG_ARPING is not set
+CONFIG_FTPGET=y
+CONFIG_FTPPUT=y
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFUPDOWN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_IPX=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+
+#
+#   address (forced enabled for ipaddr)
+#
+CONFIG_FEATURE_IP_LINK=y
+
+#
+#   link (forced enabled for iplink)
+#
+CONFIG_FEATURE_IP_ROUTE=y
+
+#
+#   route (forced enabled for iproute)
+#
+CONFIG_FEATURE_IP_TUNNEL=y
+
+#
+#   tunnel (forced enabled for iptunnel)
+#
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_NAMEIF=y
+CONFIG_NC=y
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING6=y
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_TELNETD=y
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+CONFIG_FEATURE_TFTP_DEBUG=y
+CONFIG_TRACEROUTE=y
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+CONFIG_FEATURE_TRACEROUTE_SO_DEBUG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+
+#
+# udhcp Server/Client
+#
+CONFIG_UDHCPD=y
+CONFIG_UDHCPC=y
+CONFIG_DUMPLEASES=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+CONFIG_FEATURE_UDHCP_DEBUG=y
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_PIDOF=y
+CONFIG_PS=y
+CONFIG_RENICE=y
+CONFIG_TOP=y
+FEATURE_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
+
+#
+# Another Bourne-like Shell
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# ash (forced enabled as default shell)
+#
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_CMDCMD=y
+CONFIG_ASH_MAIL=y
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_COMMAND_EDITING=y
+CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y
+CONFIG_FEATURE_COMMAND_HISTORY=15
+CONFIG_FEATURE_SH_STANDALONE_SHELL=y
+CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN=y
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+
+#
+# Shell Utilities
+#
+CONFIG_BASENAME=y
+CONFIG_CAL=y
+CONFIG_CHROOT=y
+CONFIG_DATE=y
+
+#
+# date (forced enabled for use with watch)
+#
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DIRNAME=y
+CONFIG_ECHO=y
+CONFIG_ENV=y
+CONFIG_EXPR=y
+CONFIG_FALSE=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_LOGNAME=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+# CONFIG_REALPATH is not set
+CONFIG_SLEEP=y
+CONFIG_STTY=y
+CONFIG_TEE=y
+CONFIG_TRUE=y
+CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_USLEEP=y
+CONFIG_WATCH=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# System Logging Utilities
+#
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_LOGREAD=y
+
+#
+# Text Utilities
+#
+CONFIG_CAT=y
+CONFIG_CMP=y
+CONFIG_CUT=y
+CONFIG_DOS2UNIX=y
+CONFIG_HEAD=y
+CONFIG_LENGTH=y
+CONFIG_MD5SUM=y
+CONFIG_OD=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_REVERSE=y
+CONFIG_FEATURE_SORT_UNIQUE=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TR=y
+CONFIG_UNIQ=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WC=y
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+CONFIG_FDFLUSH=y
+CONFIG_FDISK=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+CONFIG_FEATURE_AIX_LABEL=y
+CONFIG_FEATURE_SGI_LABEL=y
+CONFIG_FEATURE_SUN_LABEL=y
+# CONFIG_FEATURE_OSF_LABEL is not set
+CONFIG_FEATURE_FDISK_ADVANCED=y
+CONFIG_FREERAMDISK=y
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
+CONFIG_LOSETUP=y
+CONFIG_MKSWAP=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+
+#
+# Common options for ls and more
+#
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+CONFIG_SWAPONOFF=y
+CONFIG_MOUNT=y
+CONFIG_NFSMOUNT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_MOUNT_FORCE=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MTAB_SUPPORT=y
+
+#
+# Debugging Options
+#
+# DODEBUG is not set
diff --git a/sources/busybox.patch b/sources/busybox.patch
deleted file mode 100644
index f8b60b654..000000000
--- a/sources/busybox.patch
+++ /dev/null
@@ -1,246 +0,0 @@
---- busybox/Config.h	17 Sep 2002 22:04:28 -0000	1.118
-+++ busybox/Config.h	17 Sep 2002 23:43:54 -0000
-@@ -8,7 +8,7 @@
- //
- // BusyBox Applications
- //#define BB_ADJTIMEX
--//#define BB_AR
-+#define BB_AR
- #define BB_ASH
- #define BB_BASENAME
- #define BB_CAT
-@@ -18,14 +18,14 @@
- #define BB_CHROOT
- #define BB_CHVT
- #define BB_CLEAR
--//#define BB_CMP
-+#define BB_CMP
- #define BB_CP
--//#define BB_CPIO
-+#define BB_CPIO
- #define BB_CUT
- #define BB_DATE
--//#define BB_DC
-+#define BB_DC
- #define BB_DD
--//#define BB_DEALLOCVT
-+#define BB_DEALLOCVT
- #define BB_DF
- #define BB_DIRNAME
- #define BB_DMESG
-@@ -37,12 +37,12 @@
- //#define BB_DUMPKMAP
- #define BB_ECHO
- #define BB_ENV
--//#define BB_EXPR
--//#define BB_FBSET
-+#define BB_EXPR
-+#define BB_FBSET
- //#define BB_FDFLUSH
- #define BB_FIND
- #define BB_FREE
--//#define BB_FREERAMDISK
-+#define BB_FREERAMDISK
- //#define BB_FSCK_MINIX
- //#define BB_GETOPT
- #define BB_GREP
-@@ -50,13 +50,13 @@
- #define BB_GZIP
- #define BB_HALT
- #define BB_HEAD
--//#define BB_HOSTID
--//#define BB_HOSTNAME
-+#define BB_HOSTID
-+#define BB_HOSTNAME
- //#define BB_HUSH
- #define BB_ID
--//#define BB_IFCONFIG
-+#define BB_IFCONFIG
- #define BB_INIT
--//#define BB_INSMOD
-+#define BB_INSMOD
- #define BB_KILL
- #define BB_KILLALL
- #define BB_KLOGD
-@@ -67,77 +67,77 @@
- //#define BB_LOADFONT
- //#define BB_LOADKMAP
- #define BB_LOGGER
--//#define BB_LOGNAME
--//#define BB_LOSETUP
-+#define BB_LOGNAME
-+#define BB_LOSETUP
- #define BB_LS
- #define BB_LSMOD
- //#define BB_MAKEDEVS
--//#define BB_MD5SUM
-+#define BB_MD5SUM
- #define BB_MKDIR
- //#define BB_MKFIFO
- //#define BB_MKFS_MINIX
- #define BB_MKNOD
- #define BB_MKSWAP
--//#define BB_MKTEMP
-+#define BB_MKTEMP
- #define BB_MODPROBE
- #define BB_MORE
- #define BB_MOUNT
- //#define BB_MSH
- //#define BB_MT
- #define BB_MV
--//#define BB_NC
--//#define BB_NSLOOKUP
-+#define BB_NC
-+#define BB_NSLOOKUP
- #define BB_PIDOF
--//#define BB_PING
--//#define BB_PIVOT_ROOT
-+#define BB_PING
-+#define BB_PIVOT_ROOT
- #define BB_POWEROFF
--//#define BB_PRINTF
-+#define BB_PRINTF
- #define BB_PS
- #define BB_PWD
--//#define BB_RDATE
--//#define BB_READLINK
-+#define BB_RDATE
-+#define BB_READLINK
- #define BB_REBOOT
- //#define BB_RENICE
- #define BB_RESET
- #define BB_RM
- #define BB_RMDIR
--//#define BB_RMMOD
--//#define BB_ROUTE
-+#define BB_RMMOD
-+#define BB_ROUTE
- //#define BB_RPM2CPIO
- #define BB_SED
- //#define BB_SETKEYCODES
- #define BB_SLEEP
- #define BB_SORT
--//#define BB_STTY
-+#define BB_STTY
- #define BB_SWAPONOFF
- #define BB_SYNC
- #define BB_SYSLOGD
- #define BB_TAIL
- #define BB_TAR
--//#define BB_TEE
--//#define BB_TEST
--//#define BB_TELNET
-+#define BB_TEE
-+#define BB_TEST
-+#define BB_TELNET
- //#define BB_TFTP
--//#define BB_TIME
--//#define BB_TOP
-+#define BB_TIME
-+#define BB_TOP
- #define BB_TOUCH
--//#define BB_TR
--//#define BB_TRACEROUTE
-+#define BB_TR
-+#define BB_TRACEROUTE
- #define BB_TRUE_FALSE
- #define BB_TTY
- //#define BB_UNIX2DOS
--//#define BB_UUENCODE
--//#define BB_UUDECODE
-+#define BB_UUENCODE
-+#define BB_UUDECODE
- #define BB_UMOUNT
- #define BB_UNIQ
- #define BB_UNAME
- //#define BB_UPDATE
- #define BB_UPTIME
--//#define BB_USLEEP
--//#define BB_VI
-+#define BB_USLEEP
-+#define BB_VI
- //#define BB_WATCHDOG
- #define BB_WC
--//#define BB_WGET
-+#define BB_WGET
- #define BB_WHICH
- #define BB_WHOAMI
- #define BB_XARGS
-@@ -185,7 +185,7 @@
- #define BB_FEATURE_VERBOSE_USAGE
- //
- // Use termios to manipulate the screen ('more' is prettier with this on)
--//#define BB_FEATURE_USE_TERMIOS
-+#define BB_FEATURE_USE_TERMIOS
- //
- // calculate terminal & column widths (for more, ls, and telnet)
- #define BB_FEATURE_AUTOWIDTH
-@@ -224,10 +224,10 @@
- //#define BB_FEATURE_INIT_COREDUMPS
- //
- //Make sure nothing is printed to the console on boot
--//#define BB_FEATURE_EXTRA_QUIET
-+#define BB_FEATURE_EXTRA_QUIET
- //
- // enable syslogd -R remotehost
--#define BB_FEATURE_REMOTE_LOG
-+//#define BB_FEATURE_REMOTE_LOG
- //
- // enable syslogd -C
- //#define BB_FEATURE_IPC_SYSLOG
-@@ -248,7 +248,7 @@
- //
- // If you are using uClibc, be sure that you've already compiled
- // uClibc with INCLUDE_RPC=true (contained in the Config file)
--//#define BB_FEATURE_NFSMOUNT
-+#define BB_FEATURE_NFSMOUNT
- //
- // Enable support forced filesystem unmounting 
- // (i.e., in case of an unreachable NFS system).
-@@ -278,7 +278,7 @@
- #define BB_FEATURE_COMMAND_TAB_COMPLETION
- //
- // Attempts to match usernames in a ~-prefixed path
--//#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
-+#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
- //
- //Allow the shell to invoke all the compiled in BusyBox applets as if they
- //were shell builtins.  Nice for staticly linking an emergency rescue shell,
-@@ -299,7 +299,7 @@
- // current username and hostname.  On systems that don't have usernames
- // or hostnames, this can look hideous.
- // Only relevant if a shell is enabled.
--//#define BB_FEATURE_SH_FANCY_PROMPT
-+#define BB_FEATURE_SH_FANCY_PROMPT
- //
- // Uncomment this option to disable job control.  Job control lets you 
- // run jobs in the background (which completely useless for is all you 
-@@ -333,16 +333,16 @@
- //#define BB_FEATURE_MINIX2
- //
- // Enable ifconfig status reporting output -- this feature adds 7k.
--//#define BB_FEATURE_IFCONFIG_STATUS
-+#define BB_FEATURE_IFCONFIG_STATUS
- //
- // Enable ifconfig slip-specific options "keepalive" and "outfill"
- //#define BB_FEATURE_IFCONFIG_SLIP
- //
- // Enable ifconfig options "mem_start", "io_addr", and "irq".
--//#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-+#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
- //
- // Enable ifconfig option "hw".  Currently works for only with "ether".
--//#define BB_FEATURE_IFCONFIG_HW
-+#define BB_FEATURE_IFCONFIG_HW
- //
- // Allows "broadcast +" to set broadcast automatically based on hostaddr
- // and netmask, at a cost of about 100 bytes of code (i386).
-@@ -380,7 +380,7 @@
- #define BB_FEATURE_FIND_NEWER
- //
- // Support for the -A -B and -C context flags in grep
--//#define BB_FEATURE_GREP_CONTEXT
-+#define BB_FEATURE_GREP_CONTEXT
- //
- // Support for the EGREP applet (alias to the grep applet)
- //#define BB_FEATURE_GREP_EGREP_ALIAS