Yet another major rework of the BusyBox config system, using the considerably

modified Kbuild system I put into uClibc.  With this, there should be no more
need to modify Rules.mak since I've moved all the interesting options into the
config system.  I think I've got everything updated, but you never know, I may
have made some mistakes, so watch closely.
 -Erik

2 files changed, 232 insertions, 69 deletions

diff --git a/util-linux/Config.in b/util-linux/Config.in
new file mode 100644
index 000000000..0c84c77af
--- /dev/null
+++ b/util-linux/Config.in
@@ -0,0 +1,232 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Linux System Utilities"
+
+
+config CONFIG_DMESG
+	bool "dmesg"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FBSET
+	bool "fbset"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_FBSET_FANCY
+	bool "  Turn on extra fbset options"
+	default n
+	depends on CONFIG_FBSET
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_FBSET_READMODE
+	bool "  Turn on fbset readmode support"
+	default n
+	depends on CONFIG_FBSET
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FDFLUSH
+	bool "fdflush"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FDISK
+	bool "fdisk"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_AIX_LABEL
+	bool "  Support AIX disklabels"
+	default n
+	depends on CONFIG_FDISK
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_SGI_LABEL
+	bool "  Support SGI disklabels"
+	default n
+	depends on CONFIG_FDISK
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_SUN_LABEL
+	bool "  Support SUN disklabels"
+	default n
+	depends on CONFIG_FDISK
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_OSF_LABEL
+	bool "  Support BSD disklabels"
+	default n
+	depends on CONFIG_FDISK
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_FDISK_ADVANCED
+	bool "  Support expert mode"
+	default n
+	depends on CONFIG_FDISK
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FREERAMDISK
+	bool "freeramdisk"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FSCK_MINIX
+	bool "fsck_minix"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_MKFS_MINIX
+	bool "mkfs_minix"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+comment "Minix filesystem support"
+    depends on CONFIG_FSCK_MINIX || CONFIG_MKFS_MINIX
+
+config CONFIG_FEATURE_MINIX2
+	bool "  Support Minix fs v2 (fsck_minix/mkfs_minix)"
+	default y
+	depends on CONFIG_FSCK_MINIX || CONFIG_MKFS_MINIX
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_GETOPT
+	bool "getopt"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_HEXDUMP
+	bool "hexdump"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_HWCLOCK
+	bool "hwclock"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
+	bool "  Support long options (--hctosys,...)"
+	default n
+	depends on CONFIG_HWCLOCK
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_LOSETUP
+	bool "losetup"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_MKSWAP
+	bool "mkswap"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_MORE
+	bool "more"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_USE_TERMIOS
+	bool "  Use termios to manipulate the screen"
+	default y
+	depends on CONFIG_MORE
+	help
+	  Please submit a patch to add help text for this item.
+
+comment "Common options for ls and more"
+	depends on CONFIG_LS || CONFIG_MORE
+
+config CONFIG_FEATURE_AUTOWIDTH
+	bool "  Calculate terminal & column widths"
+	default y
+	depends on CONFIG_LS || CONFIG_MORE
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_PIVOT_ROOT
+	bool "pivot_root"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_RDATE
+	bool "rdate"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_SWAPONOFF
+	bool "swaponoff"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_MOUNT
+	bool "mount"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_NFSMOUNT
+	bool "  Support mounting nfs file systems"
+	default n
+	depends on CONFIG_MOUNT
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_UMOUNT
+	bool "umount"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_MOUNT_FORCE
+	bool "  Support forced filesystem unmounting"
+	default n
+	depends on CONFIG_UMOUNT
+	help
+	  Please submit a patch to add help text for this item.
+
+comment "Common options for mount/umount"
+	depends on CONFIG_MOUNT || CONFIG_UMOUNT
+
+config CONFIG_FEATURE_MOUNT_LOOP
+	bool "  Support for loop devices"
+	default n
+	depends on CONFIG_MOUNT || CONFIG_UMOUNT
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_MTAB_SUPPORT
+	bool "  Support for a real /etc/mtab (instead of /proc/mounts)"
+	default n
+	depends on CONFIG_MOUNT || CONFIG_UMOUNT
+	help
+	  Please submit a patch to add help text for this item.
+
+endmenu
+
diff --git a/util-linux/config.in b/util-linux/config.in
deleted file mode 100644
index eee050a05..000000000
--- a/util-linux/config.in
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-mainmenu_option next_comment
-comment 'Linux System Utilities'
-
-
-bool 'dmesg'		    CONFIG_DMESG
-bool 'fbset'		    CONFIG_FBSET
-if [ "$CONFIG_FBSET" = "y" ]; then
-    bool '  Turn on extra fbset options'	CONFIG_FEATURE_FBSET_FANCY
-    bool '  Turn on fbset readmode support'	CONFIG_FEATURE_FBSET_READMODE
-fi
-bool 'fdflush'		    CONFIG_FDFLUSH
-bool 'fdisk'                CONFIG_FDISK
-if [ "$CONFIG_FDISK" = "y" ]; then
-    bool '  Support AIX disklabels'        CONFIG_FEATURE_AIX_LABEL
-    bool '  Support SGI disklabels'        CONFIG_FEATURE_SGI_LABEL
-    bool '  Support SUN disklabels'        CONFIG_FEATURE_SUN_LABEL
-    bool '  Support BSD disklabels'        CONFIG_FEATURE_OSF_LABEL
-    bool '  Support expert mode'           CONFIG_FEATURE_FDISK_ADVANCED
-fi
-bool 'freeramdisk'	    CONFIG_FREERAMDISK
-bool 'fsck_minix'	    CONFIG_FSCK_MINIX
-bool 'mkfs_minix'	    CONFIG_MKFS_MINIX
-if [ "$CONFIG_FSCK_MINIX" = "y" -o "$CONFIG_MKFS_MINIX" = "y" ]; then
-    comment '  Minix filesystem support'
-    bool '    Support Minix fs v2 (fsck_minix/mkfs_minix)'	CONFIG_FEATURE_MINIX2
-fi
-bool 'getopt'		    CONFIG_GETOPT
-bool 'hexdump'  	    CONFIG_HEXDUMP  
-bool 'hwclock'  	    CONFIG_HWCLOCK  
-if [ "$CONFIG_HWCLOCK" = "y" ]; then
-    bool '  Support long options (--hctosys,...)'		CONFIG_FEATURE_HWCLOCK_LONGOPTIONS
-fi
-bool 'losetup'              CONFIG_LOSETUP
-bool 'mkswap'		    CONFIG_MKSWAP
-bool 'more'		    CONFIG_MORE
-if [ "$CONFIG_MORE" = "y" ]; then
-    bool '  Use termios to manipulate the screen'		CONFIG_FEATURE_USE_TERMIOS
-fi 
-if [ "$CONFIG_LS" = "y" -o "$CONFIG_MORE" = "y" ]; then
-    comment '  Common options for ls and more'
-    bool    '   Calculate terminal & column widths'	CONFIG_FEATURE_AUTOWIDTH
-fi
-bool 'pivot_root'	    CONFIG_PIVOT_ROOT
-bool 'rdate'		    CONFIG_RDATE
-bool 'swaponoff'	    CONFIG_SWAPONOFF
-bool 'mount'		    CONFIG_MOUNT
-if [ "$CONFIG_MOUNT" = "y" ]; then
-    bool '  Support mounting nfs file systems'		    	CONFIG_NFSMOUNT
-    if [ "$CONFIG_FEATURE_USE_DEVPS_PATCH" = "n" ]; then
-	bool '  Use devmtab instead of /proc (needs a patched kernel)'	CONFIG_FEATURE_USE_DEVPS_PATCH
-    fi
-fi
-bool 'umount'		    CONFIG_UMOUNT
-if [ "$CONFIG_UMOUNT" = "y" ]; then
-    bool '  Support forced filesystem unmounting'		CONFIG_FEATURE_MOUNT_FORCE
-fi
-if [ "$CONFIG_MOUNT" = "y" -o "$CONFIG_UMOUNT" = "y" ]; then
-    comment 'Common options for mount/umount'
-    bool '  Support for loop devices'				CONFIG_FEATURE_MOUNT_LOOP
-    bool '  Support for a real /etc/mtab (instead of /proc/mounts)'	CONFIG_FEATURE_MTAB_SUPPORT
-fi
-
-endmenu
-