Upgrade busybox to 1.7.2 - clean up insmod crap - add some lineno/programname fixes for awx - clean up awk getopt stuff - remove unnecessary patches

SVN-Revision: 9130

1 files changed, 23 insertions, 28 deletions

diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index ab3dc3731d..28dc7b7fdb 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -127,7 +127,7 @@ config BUSYBOX_CONFIG_FEATURE_SGI_LABEL
 config BUSYBOX_CONFIG_FEATURE_SUN_LABEL
 	bool "Support SUN disklabels"
 	default n
- 	depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
+	depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
 	help
 	  Enabling this option allows you to create or change SUN disklabels.
 	  Most people can safely leave this option disabled.
@@ -181,7 +181,7 @@ config BUSYBOX_CONFIG_MKFS_MINIX
 	  this utility will do the job for you.
 
 comment "Minix filesystem support"
-    depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
+	depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
 
 config BUSYBOX_CONFIG_FEATURE_MINIX2
 	bool "Support Minix fs v2 (fsck_minix/mkfs_minix)"
@@ -269,46 +269,41 @@ config BUSYBOX_CONFIG_MDEV
 	bool "mdev"
 	default n
 	help
-	  mdev is a mini-udev implementation: call it with -s to populate
-	  /dev from /sys, then "echo /sbin/mdev > /proc/sys/kernel/hotplug" to
-	  have it handle hotplug events afterwards.  Device names are taken
-	  from sysfs.
+	  mdev is a mini-udev implementation for dynamically creating device
+	  nodes in the /dev directory.
+
+	  For more information, please see docs/mdev.txt
 
 config BUSYBOX_CONFIG_FEATURE_MDEV_CONF
 	bool "Support /etc/mdev.conf"
 	default n
 	depends on BUSYBOX_CONFIG_MDEV
 	help
-	  The mdev config file contains lines that look like:
-
-	    hd[a-z][0-9]* 0:3 660
-
-	  That's device name (with regex match), uid:gid, and permissions.
+	  Add support for the mdev config file to control ownership and
+	  permissions of the device nodes.
 
-	  Config file parsing stops on the first matching line.  If no config
-	  entry is matched, devices are created with default 0:0 660.  (Make
-	  the last line match .* to override this.)
+	  For more information, please see docs/mdev.txt
 
 config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC
 	bool "Support command execution at device addition/removal"
 	default n
 	depends on BUSYBOX_CONFIG_FEATURE_MDEV_CONF
 	help
-	  This adds support for an optional field to /etc/mdev.conf, consisting
-	  of a special character and a command line to run after creating the
-	  corresponding device(s) and before removing, ala:
+	  This adds support for an optional field to /etc/mdev.conf for
+	  executing commands when devices are created/removed.
 
-	    hdc root:cdrom 660  *ln -s $MDEV cdrom
+	  For more information, please see docs/mdev.txt
 
-	  The $MDEV environment variable is set to the name of the device.
-
-	  The special characters and their meanings are:
-	    @ Run after creating the device.
-	    $ Run before removing the device.
-	    * Run both after creating and before removing the device.
+config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
+	bool "Support loading of firmwares"
+	default n
+	depends on BUSYBOX_CONFIG_MDEV
+	help
+	  Some devices need to load firmware before they can be usable.
 
-	  Commands are executed via system() so you need /bin/sh, meaning you
-	  probably want to select a default shell in the Shells menu.
+	  These devices will request userspace look up the files in
+	  /lib/firmware/ and if it exists, send it to the kernel for
+	  loading into the hardware.
 
 config BUSYBOX_CONFIG_MKSWAP
 	bool "mkswap"
@@ -369,7 +364,7 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
 	bool "Support mounting NFS file systems"
 	default y
 	depends on BUSYBOX_CONFIG_MOUNT
-	depends on BUSYBOX_CONFIG_FEATURE_HAVE_RPC
+	select BUSYBOX_CONFIG_FEATURE_HAVE_RPC
 	select BUSYBOX_CONFIG_FEATURE_SYSLOG
 	help
 	  Enable mounting of NFS file systems.
@@ -495,7 +490,7 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
 	  The umount command will also free that loopback device.
 
 	  You can still use the 'losetup' utility (to manually associate files
-          with loop devices) if you need to do something advanced, such as
+	  with loop devices) if you need to do something advanced, such as
 	  specify an offset or cryptographic options to the loopback device.
 	  (If you don't want umount to free the loop device, use "umount -D".)