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, 158 insertions, 45 deletions

diff --git a/archival/Config.in b/archival/Config.in
new file mode 100644
index 000000000..ecef07f7c
--- /dev/null
+++ b/archival/Config.in
@@ -0,0 +1,158 @@
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+
+menu "Archival Utilities"
+
+config CONFIG_AR
+        bool "ar"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_AR_LONG_FILENAMES
+        bool "  Enable support for long filenames (not need for debs)"
+        default n
+        depends on CONFIG_AR
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_BUNZIP2
+        bool "bunzip2"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_CPIO
+        bool "cpio"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_DPKG
+        bool "dpkg"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_DPKG_DEB
+        bool "dpkg_deb"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
+        bool "  extract only (-x)"
+        default n
+        depends on CONFIG_DPKG_DEB
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_DEB_TAR_GZ
+        bool "  gzip debian packages (normal)"
+        default y if CONFIG_DPKG || CONFIG_DPKG_DEB
+        depends on CONFIG_DPKG || CONFIG_DPKG_DEB
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_DEB_TAR_BZ2
+        bool "  bzip2 debian packages"
+        default n
+        depends on CONFIG_DPKG || CONFIG_DPKG_DEB
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_GUNZIP
+        bool "gunzip"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_GUNZIP_UNCOMPRESS
+        bool "  Uncompress support"
+        default n
+        depends on CONFIG_GUNZIP
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_GZIP
+        bool "gzip"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_RPM2CPIO
+        bool "rpm2cpio"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_TAR
+        bool "tar"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TAR_CREATE
+        bool "  Enable archive creation"
+        default y
+        depends on CONFIG_TAR
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TAR_BZIP2
+        bool "  Enable -j option to handle .tar.bz2 files"
+        default n
+        depends on CONFIG_TAR
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TAR_EXCLUDE
+        bool "  Enable -X and --exclude options (exclude files)"
+        default n
+        depends on CONFIG_TAR
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TAR_GZIP
+        bool "  Enable -z option"
+        default y
+        depends on CONFIG_TAR
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_TAR_OLD_FORMAT
+        bool "  Enable support for old tar header format"
+        default n
+        depends on CONFIG_TAR
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_GNUTAR_LONG_FILENAME
+        bool "  Enable support for GNU long filenames"
+        default y
+        depends on CONFIG_TAR
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_FEATURE_UNARCHIVE_TAPE
+        bool "  Enable tape drive support"
+        default n
+        depends on CONFIG_TAR || CONFIG_CPIO
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_UNCOMPRESS
+        bool "uncompress"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+config CONFIG_UNZIP
+        bool "unzip"
+        default n
+        help
+          Please submit a patch to add help text for this item.
+
+endmenu
diff --git a/archival/config.in b/archival/config.in
deleted file mode 100644
index 05e6dcae4..000000000
--- a/archival/config.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-mainmenu_option next_comment
-comment 'Archival Utilities'
-
-bool 'ar'           CONFIG_AR
-if [ "$CONFIG_AR" = "y" ] ; then
-    bool '  Enable support for long filenames (not need for debs)'      CONFIG_FEATURE_AR_LONG_FILENAMES
-fi
-bool 'bunzip2'      CONFIG_BUNZIP2
-bool 'cpio'         CONFIG_CPIO
-bool 'dpkg'         CONFIG_DPKG
-bool 'dpkg_deb'     CONFIG_DPKG_DEB
-if [ "$CONFIG_DPKG_DEB" = "y" ] ; then
-    bool '  extract only (-x)'  CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
-fi
-if [ "$CONFIG_DPKG" = "y" ] || [ "$CONFIG_DPKG_DEB" = "y" ] ; then
-    comment 'Common dpkg/dpkg-deb options'
-    bool '  gzip debian packages (normal)'      CONFIG_FEATURE_DEB_TAR_GZ
-    bool '  bzip2 debian packages'              CONFIG_FEATURE_DEB_TAR_BZ2
-fi
-bool 'gunzip'       CONFIG_GUNZIP
-if [ "$CONFIG_GUNZIP" = "y" ]; then
-    bool '  Uncompress support'         CONFIG_FEATURE_GUNZIP_UNCOMPRESS
-fi
-bool 'gzip'         CONFIG_GZIP
-bool 'rpm2cpio'     CONFIG_RPM2CPIO
-bool 'tar'          CONFIG_TAR
-if [ "$CONFIG_TAR" = "y" ] ; then
-    bool '  Enable archive creation'    CONFIG_FEATURE_TAR_CREATE
-    bool '  Enable -j option to handle .tar.bz2 files'  CONFIG_FEATURE_TAR_BZIP2
-    bool '  Enable -X and --exclude options (exclude files)'    CONFIG_FEATURE_TAR_EXCLUDE
-    bool '  Enable -z option'   CONFIG_FEATURE_TAR_GZIP
-    bool '  Enable support for old tar header format'   CONFIG_FEATURE_TAR_OLD_FORMAT
-    bool '  Enable support for GNU long filenames' CONFIG_FEATURE_GNUTAR_LONG_FILENAME
-fi
-if [ "$CONFIG_CPIO" = "y" -o "$CONFIG_TAR" = "y" ] ; then
-    bool '  Enable tape drive support' CONFIG_FEATURE_UNARCHIVE_TAPE
-fi
-bool 'uncompress'   CONFIG_UNCOMPRESS
-bool 'unzip'        CONFIG_UNZIP
-endmenu