kernel: remove kmod-crypto-aes, AES crypto support is always built into the kernel

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

diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 8d2731d1993f58caeb28868489428a8428b4269c..e702a3d9b31029f7558e309422451423f016ae45 100644 (file)
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -62,7 +62,7 @@ $(eval $(call KernelPackage,fs-autofs4))
 define KernelPackage/fs-btrfs
   SUBMENU:=$(FS_MENU)
   TITLE:=BTRFS filesystem support
-  DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +!LINUX_3_8:kmod-lib-raid6 +!LINUX_3_8:kmod-lib-xor
+  DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib +kmod-lib-raid6 +kmod-lib-xor
   KCONFIG:=\
        CONFIG_BTRFS_FS \
        CONFIG_BTRFS_FS_POSIX_ACL=n \
@@ -155,15 +155,18 @@ $(eval $(call KernelPackage,fs-exportfs))
 define KernelPackage/fs-ext4
   SUBMENU:=$(FS_MENU)
   TITLE:=EXT4 filesystem support
+  DEPENDS := \
+    +kmod-lib-crc16 \
+    +kmod-crypto-hash
   KCONFIG:= \
        CONFIG_EXT4_FS \
+       CONFIG_EXT4_ENCRYPTION=n \
        CONFIG_JBD2
   FILES:= \
        $(LINUX_DIR)/fs/ext4/ext4.ko \
        $(LINUX_DIR)/fs/jbd2/jbd2.ko \
        $(LINUX_DIR)/fs/mbcache.ko
   AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1)
-  $(call AddDepends/crc16, +kmod-crypto-hash)
 endef
 
 define KernelPackage/fs-ext4/description
@@ -298,14 +301,9 @@ define KernelPackage/fs-nfs
        CONFIG_NFS_FS \
        CONFIG_NFS_USE_LEGACY_DNS=n \
        CONFIG_NFS_USE_NEW_IDMAPPER=n
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
   FILES:= \
        $(LINUX_DIR)/fs/nfs/nfs.ko \
        $(LINUX_DIR)/fs/nfs/nfsv3.ko
-else
-  FILES:= \
-       $(LINUX_DIR)/fs/nfs/nfs.ko
-endif
   AUTOLOAD:=$(call AutoLoad,40,nfs nfsv3)
 endef
 
@@ -321,19 +319,13 @@ define KernelPackage/fs-nfs-common
   TITLE:=Common NFS filesystem modules
   KCONFIG:= \
        CONFIG_LOCKD \
-       CONFIG_SUNRPC
-ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.18.0)),1)
+       CONFIG_SUNRPC \
+       CONFIG_GRACE_PERIOD
   FILES:= \
-       $(LINUX_DIR)/fs/nfs_common/grace.ko \
        $(LINUX_DIR)/fs/lockd/lockd.ko \
-       $(LINUX_DIR)/net/sunrpc/sunrpc.ko
+       $(LINUX_DIR)/net/sunrpc/sunrpc.ko \
+       $(LINUX_DIR)/fs/nfs_common/grace.ko
   AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd)
-else
-  FILES:= \
-       $(LINUX_DIR)/fs/lockd/lockd.ko \
-       $(LINUX_DIR)/net/sunrpc/sunrpc.ko
-  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)
-endif
 endef
 
 $(eval $(call KernelPackage,fs-nfs-common))
@@ -448,7 +440,7 @@ define KernelPackage/fs-xfs
   SUBMENU:=$(FS_MENU)
   TITLE:=XFS filesystem support
   KCONFIG:=CONFIG_XFS_FS
-  DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c @!avr32
+  DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c
   FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko
   AUTOLOAD:=$(call AutoLoad,30,xfs,1)
 endef