[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 da52b32eca97f854c24a312c04f29c09d01d128a..c2ae55194808534687359537c056a08e6b28c9bd 100644 (file)
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -25,16 +25,15 @@ $(eval $(call KernelPackage,fs-autofs4))
 define KernelPackage/fs-btrfs
   SUBMENU:=$(FS_MENU)
   TITLE:=BTRFS filesystem support
-  # for crc32c
-  DEPENDS:=+kmod-crypto-core +kmod-crypto-misc
+  DEPENDS:=+kmod-libcrc32c
   KCONFIG:=\
-       CONFIG_LIBCRC32C \
        CONFIG_BTRFS_FS \
-       CONFIG_BTRFS_FS_POSIX_ACL=n
+       CONFIG_BTRFS_FS_POSIX_ACL=n \
+       CONFIG_ZLIB_DEFLATE
   FILES:=\
-       $(LINUX_DIR)/lib/libcrc32c.ko \
-       $(LINUX_DIR)/fs/btrfs/btrfs.ko
-  AUTOLOAD:=$(call AutoLoad,30,crc32c libcrc32c 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
@@ -115,9 +114,6 @@ define KernelPackage/fs-ext4
   SUBMENU:=$(FS_MENU)
   TITLE:=EXT4 filesystem support
   KCONFIG:= \
-       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)