Skip to contentSkip to conversation

select ZLIB_{IN,DE}FLATE

PATCH In review Adrian Bunk 2 participants 2 messages Sep 27, 2003 – Sep 28, 2003

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 select ZLIB_{IN,DE}FLATE

Hi Linus,

similar to the patch Brian Gerst sent for CRC32, this patch changes ZLIB_{IN,DE}FLATE to be select'ed.

IMHO, the dependencies are much better maintainable that way.

diffstat output:

 crypto/Kconfig      |    2 ++
 drivers/net/Kconfig |    2 ++
 fs/Kconfig          |    4 ++++
 fs/Kconfig.binfmt   |    1 +
 lib/Kconfig         |    7 +------
 5 files changed, 10 insertions(+), 6 deletions(-)

cu
Adrian

lib/Kconfig renamed from lib/Kconfig.old +1 -6
@@ -13,18 +13,13 @@
 	  require M here.
 
 #
-# Do we need the compression support?
+# compression support is select'ed if needed
 #
 config ZLIB_INFLATE
 	tristate
-	default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || BINFMT_ZFLAT=y || CRYPTO_DEFLATE=y
-	default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || BINFMT_ZFLAT=m || CRYPTO_DEFLATE=m
 
 config ZLIB_DEFLATE
 	tristate
-	default m if PPP_DEFLATE!=y && JFFS2_FS!=y && CRYPTO_DEFLATE!=y && \
-		(PPP_DEFLATE=m || JFFS2_FS=m || CRYPTO_DEFLATE=m)
-	default y if PPP_DEFLATE=y || JFFS2_FS=y || CRYPTO_DEFLATE=y
 
 endmenu
 
fs/Kconfig renamed from fs/Kconfig.old +4 -0
@@ -496,6 +496,7 @@
 config ZISOFS
 	bool "Transparent decompression extension"
 	depends on ISO9660_FS
+	select ZLIB_INFLATE
 	help
 	  This is a Linux-specific extension to RockRidge which lets you store
 	  data in compressed form on a CD-ROM and have it transparently
@@ -1047,6 +1048,8 @@
 	tristate "Journalling Flash File System v2 (JFFS2) support"
 	depends on MTD
 	select CRC32
+	select ZLIB_INFLATE
+	select ZLIB_DEFLATE
 	help
 	  JFFS2 is the second generation of the Journalling Flash File System
 	  for use on diskless embedded devices. It provides improved wear
@@ -1092,6 +1095,7 @@
 
 config CRAMFS
 	tristate "Compressed ROM file system support"
+	select ZLIB_INFLATE
 	help
 	  Saying Y here includes support for CramFs (Compressed ROM File
 	  System).  CramFs is designed to be a simple, small, and compressed
fs/Kconfig.binfmt renamed from fs/Kconfig.binfmt.old +1 -0
@@ -36,6 +36,7 @@
 config BINFMT_ZFLAT
 	bool "Enable ZFLAT support"
 	depends on BINFMT_FLAT
+	select ZLIB_INFLATE
 	help
 	  Support FLAT format compressed binaries
 
drivers/net/Kconfig renamed from drivers/net/Kconfig.old +2 -0
@@ -2268,6 +2268,8 @@
 config PPP_DEFLATE
 	tristate "PPP Deflate compression"
 	depends on PPP
+	select ZLIB_INFLATE
+	select ZLIB_DEFLATE
 	---help---
 	  Support for the Deflate compression method for PPP, which uses the
 	  Deflate algorithm (the same algorithm that gzip uses) to compress
crypto/Kconfig renamed from crypto/Kconfig.old +2 -0
@@ -143,6 +143,8 @@
 config CRYPTO_DEFLATE
 	tristate "Deflate compression algorithm"
 	depends on CRYPTO
+	select ZLIB_INFLATE
+	select ZLIB_DEFLATE
 	help
 	  This is the Deflate algorithm (RFC1951), specified for use in
 	  IPSec with the IPCOMP protocol (RFC3173, RFC2394).
#1 lore raw
Quoted 5 lines · Adrian Bunk

Hi Linus,

similar to the patch Brian Gerst sent for CRC32, this patch changes ZLIB_{IN,DE}FLATE to be select'ed.

Good idea.

- James

Signature · 2 lines
James Morris
<[email protected]>