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, 208 insertions, 63 deletions

diff --git a/shell/Config.in b/shell/Config.in
new file mode 100644
index 000000000..3f5d53222
--- /dev/null
+++ b/shell/Config.in
@@ -0,0 +1,208 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Bourne Shell"
+
+choice
+	prompt "Choose your default shell"
+	default "ash"
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_SH_IS_ASH
+	bool "ash"
+
+config CONFIG_FEATURE_SH_IS_HUSH
+	bool "hush"
+
+config CONFIG_FEATURE_SH_IS_LASH
+	bool "lash"
+
+config CONFIG_FEATURE_SH_IS_MSH
+	bool "msh"
+
+endchoice
+
+if CONFIG_FEATURE_SH_IS_ASH
+	config CONFIG_ASH
+	default y
+
+	comment "ash (forced enabled as default shell)"
+endif
+	
+if !CONFIG_FEATURE_SH_IS_ASH
+config CONFIG_ASH
+	bool "ash"
+	default y
+	help
+	  Please submit a patch to add help text for this item.
+endif
+
+comment "Ash Shell Options"
+	depends on CONFIG_ASH
+
+config CONFIG_ASH_JOB_CONTROL
+	bool "  Enable Job control"
+	default y
+	depends on CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_ASH_ALIAS
+	bool "  Enable alias support"
+	default y
+	depends on CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_ASH_MATH_SUPPORT
+	bool "  Enable Posix math support"
+	default y
+	depends on CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_ASH_GETOPTS
+	bool "  Enable getopt builtin to parse positional parameters"
+	default n
+	depends on CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_ASH_CMDCMD
+	bool "  Enable cmdcmd to override shell builtins"
+	default n
+	depends on CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_ASH_MAIL
+	bool "  Check for new mail on interactive shells"
+	default y
+	depends on CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_ASH_OPTIMIZE_FOR_SIZE
+	bool "  Optimize for size instead of speed"
+	default y
+	depends on CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_COMMAND_SAVEHISTORY
+	bool "  history saving"
+	default n
+	depends on CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+if CONFIG_FEATURE_SH_IS_HUSH
+	config CONFIG_HUSH
+	default y
+
+	comment "hush (forced enabled as default shell)"
+endif
+	
+if !CONFIG_FEATURE_SH_IS_HUSH
+config CONFIG_HUSH
+	bool "hush"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+endif
+
+if CONFIG_FEATURE_SH_IS_LASH
+	config CONFIG_LASH
+	default y
+
+	comment "lash (forced enabled as default shell)"
+endif
+
+if !CONFIG_FEATURE_SH_IS_LASH
+config CONFIG_LASH
+	bool "lash"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+endif
+
+if CONFIG_FEATURE_SH_IS_MSH
+	config CONFIG_MSH
+	default y
+
+	comment "msh (forced enabled as default shell)"
+endif
+
+if !CONFIG_FEATURE_SH_IS_MSH
+config CONFIG_MSH
+	bool "msh"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+endif
+
+
+comment "Bourne Shell Options"
+	depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+
+config CONFIG_FEATURE_COMMAND_EDITING
+	bool "command line editing"
+	default n
+	depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_COMMAND_TAB_COMPLETION
+	bool "tab completion"
+	default n
+	depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
+	bool "username completion"
+	default n
+	depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_COMMAND_HISTORY
+	int "history size"
+	default 15
+	depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_SH_STANDALONE_SHELL
+	bool "Standalone shell"
+	default n
+	depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
+	bool "Standalone shell -- applets always win"
+	default n
+	depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_SH_FANCY_PROMPT
+	bool "Fancy shell prompts"
+	default n
+	depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_SH_EXTRA_QUIET
+	bool "Hide message on interactive shell startup"
+	default n
+	depends on CONFIG_MSH || CONFIG_LASH || CONFIG_HUSH || CONFIG_ASH
+	help
+	  Please submit a patch to add help text for this item.
+
+endmenu
+
diff --git a/shell/config.in b/shell/config.in
deleted file mode 100644
index cb1365b9d..000000000
--- a/shell/config.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-mainmenu_option next_comment
-comment 'Bourne Shell'
-
-choice 'Choose your default shell' \
-    "ash                                    CONFIG_FEATURE_SH_IS_ASH  \
-    hush                                    CONFIG_FEATURE_SH_IS_HUSH \
-    lash                                    CONFIG_FEATURE_SH_IS_LASH \
-    msh                                     CONFIG_FEATURE_SH_IS_MSH  \
-    none                                    CONFIG_FEATURE_SH_IS_NONE" \
-    ash
-
-if [ "$CONFIG_FEATURE_SH_IS_ASH" = "y" ] ; then
-	define_bool CONFIG_ASH	y
-fi
-	
-if [ "$CONFIG_FEATURE_SH_IS_HUSH" = "y" ] ; then
-	define_bool CONFIG_HUSH	y
-fi
-
-if [ "$CONFIG_FEATURE_SH_IS_LASH" = "y" ] ; then
-	define_bool CONFIG_LASH	y
-fi
-
-if [ "$CONFIG_FEATURE_SH_IS_MSH" = "y" ] ; then
-	define_bool CONFIG_MSH	y
-fi
-
-bool 'ash'	    CONFIG_ASH
-if [ "$CONFIG_ASH" = "y" ] ; then
-	comment 'Ash Shell Options'
-	bool 'Enable Job control'		CONFIG_ASH_JOB_CONTROL
-	bool 'Enable alias support'		CONFIG_ASH_ALIAS
-	bool 'Enable Posix math support'	CONFIG_ASH_MATH_SUPPORT
-	bool 'Enable getopt builtin to parse positional parameters'		CONFIG_ASH_GETOPTS
-	bool 'Enable cmdcmd to override shell builtins'		CONFIG_ASH_CMDCMD
-	bool 'Check for new mail on interactive shells'		CONFIG_ASH_MAIL
-	bool 'Optimize for size instead of speed'	CONFIG_ASH_OPTIMIZE_FOR_SIZE
-	comment ''
-fi
-
-bool 'hush'	    CONFIG_HUSH
-bool 'lash'	    CONFIG_LASH
-bool 'msh'	    CONFIG_MSH
-
-	
-comment 'Bourne Shell Options'
-bool 'command line editing'		CONFIG_FEATURE_COMMAND_EDITING
-bool 'tab completion'			CONFIG_FEATURE_COMMAND_TAB_COMPLETION
-bool 'username completion'		CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
-int  'history size'             CONFIG_FEATURE_COMMAND_HISTORY  15
-bool 'history saving (currently only ash)'         CONFIG_FEATURE_COMMAND_SAVEHISTORY
-bool 'Standalone shell'			CONFIG_FEATURE_SH_STANDALONE_SHELL
-bool 'Standalone shell -- applets always win'	CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN
-bool 'Fancy shell prompts'	CONFIG_FEATURE_SH_FANCY_PROMPT
-bool 'Hide message on interactive shell startup'	CONFIG_FEATURE_SH_EXTRA_QUIET
-
-endmenu
-