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, 84 insertions, 37 deletions

diff --git a/modutils/Config.in b/modutils/Config.in
new file mode 100644
index 000000000..9af0ad6dc
--- /dev/null
+++ b/modutils/Config.in
@@ -0,0 +1,84 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Module Utilities"
+
+config CONFIG_INSMOD
+	bool "insmod"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_OLD_MODULE_INTERFACE
+	bool "  Support older (pre 2.1) Linux kernels"
+	default n
+	depends on CONFIG_INSMOD
+	help
+	  Please submit a patch to add help text for this item.
+
+if CONFIG_INSMOD && !CONFIG_FEATURE_OLD_MODULE_INTERFACE
+    config CONFIG_FEATURE_NEW_MODULE_INTERFACE
+	    default y
+    comment "  Support new (post 2.1) Linux kernels (Forced enabled)"
+endif
+
+if CONFIG_FEATURE_OLD_MODULE_INTERFACE
+config CONFIG_FEATURE_NEW_MODULE_INTERFACE
+	bool "  Support new (post 2.1) Linux kernels"
+	default y
+	depends on CONFIG_INSMOD
+	help
+	  Please submit a patch to add help text for this item.
+endif
+
+config CONFIG_FEATURE_INSMOD_VERSION_CHECKING
+	bool "  Module version checking"
+	default n
+	depends on CONFIG_INSMOD
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_INSMOD_LOADINKMEM
+	bool "  In kernel memory optimization (uClinux only)"
+	default n
+	depends on CONFIG_INSMOD
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_LSMOD
+	bool "lsmod"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_QUERY_MODULE_INTERFACE
+	bool "  Support lsmod query_module interface (add 638 bytes)"
+	default y
+	depends on CONFIG_LSMOD && CONFIG_FEATURE_NEW_MODULE_INTERFACE
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_MODPROBE
+	bool "modprobe"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_RMMOD
+	bool "rmmod"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_CHECK_TAINTED_MODULE
+	bool "Support tainted module checking with new kernels"
+	default y
+	depends on CONFIG_INSMOD || CONFIG_LSMOD
+	help
+	  Please submit a patch to add help text for this item.
+
+
+endmenu
+
diff --git a/modutils/config.in b/modutils/config.in
deleted file mode 100644
index 10b0a9c33..000000000
--- a/modutils/config.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-mainmenu_option next_comment
-comment 'Module Utilities'
-
-
-bool 'insmod'	    CONFIG_INSMOD
-bool 'lsmod'	    CONFIG_LSMOD
-bool 'modprobe'	    CONFIG_MODPROBE
-bool 'rmmod'	    CONFIG_RMMOD
-
-if [ "$CONFIG_INSMOD" = "y" ]; then
-    comment 'Module support options'
-    bool 'Support for older (pre 2.1) Linux kernels'		CONFIG_FEATURE_OLD_MODULE_INTERFACE
-    if [ "$CONFIG_FEATURE_OLD_MODULE_INTERFACE" = "n" ] ; then
-	    define_bool CONFIG_FEATURE_NEW_MODULE_INTERFACE	y
-    fi
-    bool 'Support for new (post 2.1) kernels'			CONFIG_FEATURE_NEW_MODULE_INTERFACE
-    bool 'Support module version checking'			CONFIG_FEATURE_INSMOD_VERSION_CHECKING
-    bool 'Support image in kernel memory optimization (uClinux only)'		CONFIG_FEATURE_INSMOD_LOADINKMEM
-fi
-
-if [ "$CONFIG_LSMOD" = "y" ]; then
-	if [ "$CONFIG_FEATURE_NEW_MODULE_INTERFACE" = "y" ]; then
-		bool 'Support lsmod query_module interface (add 638 bytes)'     CONFIG_FEATURE_QUERY_MODULE_INTERFACE
-	fi
-fi
-
-if [ "$CONFIG_INSMOD" = "y" -o "$CONFIG_LSMOD" = "y" ]; then
-	bool 'Support tainted module checking with new kernels'  CONFIG_FEATURE_CHECK_TAINTED_MODULE
-fi
-
-endmenu
-