[BusyBox] [PATCH] Make CONFIG_FEATURE_DEB_TAR_{GZ, BZ2} common for applets dpkg{, _deb}

[Arthur Othieno]

Greetings,

Current menu layout looks like this:

  [*] dpkg
  [*] dpkg_deb
  [ ]     Extract only (-x)
  [*]     gzip debian packages (normal)
  [*]     bzip2 debian packages

This patch makes CONFIG_FEATURE_DEB_TAR_{GZ,BZ2} common between
dpkg and dpkg_deb. Please apply:

  [*] dpkg
  [*] dpkg_deb
  [ ]     Extract only (-x)
  --- Common options for dpkg and dpkg_deb
  [*] gzip debian packages (normal)
  [*] bzip2 debian packages


 Config.in |   43 +++++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 20 deletions(-)


Index: archival/Config.in
===================================================================
RCS file: /var/cvs/busybox/archival/Config.in,v
retrieving revision 1.13
diff -u -r1.13 Config.in
--- archival/Config.in	26 Dec 2003 14:01:36 -0000	1.13
+++ archival/Config.in	16 Jan 2004 14:20:36 -0000
@@ -97,26 +97,6 @@
 	  However it saves space as none of the extra dpkg-deb, ar or tar options are 
 	  needed, they are linked to internally.
 
-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
-	  This is the default compression method inside the debian ar file.
-	  
-	  If you want compatibility with standard .deb's you should say yes here.
-
-config CONFIG_FEATURE_DEB_TAR_BZ2
-	bool "  bzip2 debian packages"
-	default n
-	depends on CONFIG_DPKG || CONFIG_DPKG_DEB
-	help
-	  This allows dpkg and dpkg-deb to extract deb's that are compressed internally
-	  with bzip2 instead of gzip.
-	  
-	  You only want this if you are creating your own custom debian packages that
-	  use an internal control.tar.bz2 or data.tar.bz2.
-
 config CONFIG_GUNZIP
 	bool "gunzip"
 	default n
@@ -252,4 +232,27 @@
 	help
 	  I don't think this is needed anymore.
 
+comment "Common options for dpkg and dpkg_deb"
+	depends on CONFIG_DPKG || CONFIG_DPKG_DEB
+
+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
+	  This is the default compression method inside the debian ar file.
+	  
+	  If you want compatibility with standard .deb's you should say yes here.
+
+config CONFIG_FEATURE_DEB_TAR_BZ2
+	bool "  bzip2 debian packages"
+	default n
+	depends on CONFIG_DPKG || CONFIG_DPKG_DEB
+	help
+	  This allows dpkg and dpkg-deb to extract deb's that are compressed internally
+	  with bzip2 instead of gzip.
+	  
+	  You only want this if you are creating your own custom debian packages that
+	  use an internal control.tar.bz2 or data.tar.bz2.
+
 endmenu
-- 
Linux is a true multitasking system. Are you?