[package] kernel/modules: fix kmod-fs-btrfs deps / zlib_deflate / makefile

[openwrt/svn-archive/archive.git] / package / kernel / modules / fs.mk

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 38885f9f960c5ffb9ae3bd16f35e1f727e18d432..c2ae55194808534687359537c056a08e6b28c9bd 100644 (file)
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -28,10 +28,12 @@ define KernelPackage/fs-btrfs
   DEPENDS:=+kmod-libcrc32c
   KCONFIG:=\
        CONFIG_BTRFS_FS \
-       CONFIG_BTRFS_FS_POSIX_ACL=n
+       CONFIG_BTRFS_FS_POSIX_ACL=n \
+       CONFIG_ZLIB_DEFLATE
   FILES:=\
-       $(LINUX_DIR)/fs/btrfs/btrfs.ko
-  AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
+       $(LINUX_DIR)/fs/btrfs/btrfs.ko \
+       $(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko
+  AUTOLOAD:=$(call AutoLoad,30,zlib_deflate btrfs,1)
 endef
 
 define KernelPackage/fs-btrfs/description
@@ -76,7 +78,7 @@ define KernelPackage/fs-ext2
   SUBMENU:=$(FS_MENU)
   TITLE:=EXT2 filesystem support
   KCONFIG:=CONFIG_EXT2_FS
-  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko
   AUTOLOAD:=$(call AutoLoad,32,ext2,1)
 endef
@@ -94,7 +96,7 @@ define KernelPackage/fs-ext3
   KCONFIG:= \
        CONFIG_EXT3_FS \
        CONFIG_JBD
-  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:= \
        $(LINUX_DIR)/fs/ext3/ext3.ko \
        $(LINUX_DIR)/fs/jbd/jbd.ko
@@ -112,10 +114,6 @@ define KernelPackage/fs-ext4
   SUBMENU:=$(FS_MENU)
   TITLE:=EXT4 filesystem support
   KCONFIG:= \
-       CONFIG_EXT4DEV_COMPAT=n \
-       CONFIG_EXT4_FS_XATTR=y \
-       CONFIG_EXT4_FS_POSIX_ACL=y \
-       CONFIG_EXT4_FS_SECURITY=y \
        CONFIG_EXT4_FS \
        CONFIG_JBD2
   DEPENDS:= $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)