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, 97 insertions, 32 deletions

diff --git a/loginutils/Config.in b/loginutils/Config.in
new file mode 100644
index 000000000..15727d290
--- /dev/null
+++ b/loginutils/Config.in
@@ -0,0 +1,97 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Login/Password Management Utilities"
+
+config CONFIG_USE_BB_PWD_GRP
+	bool "Use internal password and group functions rather than system functions"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_ADDGROUP
+	bool "addgroup"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_DELGROUP
+	bool "delgroup"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_ADDUSER
+	bool "adduser"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_DELUSER
+	bool "deluser"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_GETTY
+	bool "getty"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_LOGIN
+	bool "login"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_SECURETTY
+	bool "  Support for /etc/securetty"
+	default y
+	depends on CONFIG_LOGIN
+	help
+	  Please submit a patch to add help text for this item.
+
+
+config CONFIG_PASSWD
+	bool "passwd"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_SU
+	bool "su"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_SHADOWPASSWDS
+	bool "Support for shadow passwords"
+	default y
+	depends on CONFIG_ADDUSER || CONFIG_DELUSER || CONFIG_LOGIN || CONFIG_SU
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_USE_BB_SHADOW
+	bool "  Use busybox shadow password functions"
+	default n
+	depends on CONFIG_USE_BB_PWD_GRP && CONFIG_FEATURE_SHADOWPASSWDS
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_SULOGIN
+	bool "sulogin"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+config CONFIG_VLOCK
+	bool "vlock"
+	default n
+	help
+	  Please submit a patch to add help text for this item.
+
+endmenu
+
diff --git a/loginutils/config.in b/loginutils/config.in
deleted file mode 100644
index 6280ff2a6..000000000
--- a/loginutils/config.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-mainmenu_option next_comment
-comment 'Login/Password Management Utilities'
-
-
-bool 'Use internal password and group functions instead of the system functions'	CONFIG_USE_BB_PWD_GRP
-bool 'addgroup'			CONFIG_ADDGROUP
-bool 'delgroup'			CONFIG_DELGROUP
-bool 'adduser'			CONFIG_ADDUSER
-bool 'deluser'			CONFIG_DELUSER
-bool 'getty'			CONFIG_GETTY
-bool 'login'			CONFIG_LOGIN
-if [ "$CONFIG_LOGIN" = "y" ]; then
-	bool '  Support for /etc/securetty'		CONFIG_FEATURE_SECURETTY
-fi
-bool 'passwd'			CONFIG_PASSWD
-bool 'su'			CONFIG_SU
-if [ "$CONFIG_ADDUSER" = "y" -o "$CONFIG_DELUSER" = "y" -o "$CONFIG_LOGIN" = "y" -o "$CONFIG_SU" = "y" ]; then
-    bool '  Support for shadow passwords'		CONFIG_FEATURE_SHADOWPASSWDS
-    if [ "$CONFIG_USE_BB_PWD_GRP" = "y" -a  "$CONFIG_FEATURE_SHADOWPASSWDS" = "y" ]; then
-       bool '  Use busybox shadow password functions'			CONFIG_USE_BB_SHADOW
-    fi
-fi
-bool 'sulogin'			CONFIG_SULOGIN
-bool 'vlock'			CONFIG_VLOCK
-
-endmenu
-