X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/eb30c3b7ceb6ded6394c37007a25fd887ac44d8b..6a05c1cf00e2a880936c2a913830c4d9281fcf0b:/package/kernel/modules/fs.mk?ds=sidebyside

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index d411b1e51..f7720e0e1 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,7 +11,7 @@ define KernelPackage/fs-autofs4
   SUBMENU:=$(FS_MENU)
   TITLE:=AUTOFS4 filesystem support
   KCONFIG:=CONFIG_AUTOFS4_FS 
-  FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.ko
   AUTOLOAD:=$(call AutoLoad,30,autofs4)
 endef
 
@@ -25,16 +25,13 @@ $(eval $(call KernelPackage,fs-autofs4))
 define KernelPackage/fs-btrfs
   SUBMENU:=$(FS_MENU)
   TITLE:=BTRFS filesystem support
-  # for crc32c
-  DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-misc
+  DEPENDS:=+kmod-libcrc32c +kmod-zlib
   KCONFIG:=\
-	CONFIG_LIBCRC32C \
 	CONFIG_BTRFS_FS \
 	CONFIG_BTRFS_FS_POSIX_ACL=n
   FILES:=\
-	$(LINUX_DIR)/lib/libcrc32c.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/fs/btrfs/btrfs.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,crc32c libcrc32c btrfs,1)
+	$(LINUX_DIR)/fs/btrfs/btrfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
 endef
 
 define KernelPackage/fs-btrfs/description
@@ -48,7 +45,7 @@ define KernelPackage/fs-cifs
   SUBMENU:=$(FS_MENU)
   TITLE:=CIFS support
   KCONFIG:=CONFIG_CIFS
-  FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko
   AUTOLOAD:=$(call AutoLoad,30,cifs)
 $(call AddDepends/nls)
 endef
@@ -64,7 +61,7 @@ define KernelPackage/fs-exportfs
   SUBMENU:=$(FS_MENU)
   TITLE:=exportfs kernel server support
   KCONFIG:=CONFIG_EXPORTFS
-  FILES=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX)
+  FILES=$(LINUX_DIR)/fs/exportfs/exportfs.ko
   AUTOLOAD:=$(call AutoLoad,20,exportfs)
 endef
 
@@ -79,8 +76,8 @@ define KernelPackage/fs-ext2
   SUBMENU:=$(FS_MENU)
   TITLE:=EXT2 filesystem support
   KCONFIG:=CONFIG_EXT2_FS
-  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
-  FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31
+  FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko
   AUTOLOAD:=$(call AutoLoad,32,ext2,1)
 endef
 
@@ -97,10 +94,10 @@ define KernelPackage/fs-ext3
   KCONFIG:= \
 	CONFIG_EXT3_FS \
 	CONFIG_JBD
-  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31
   FILES:= \
-	$(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/ext3/ext3.ko \
+	$(LINUX_DIR)/fs/jbd/jbd.ko
   AUTOLOAD:=$(call AutoLoad,31,jbd ext3,1)
 endef
 
@@ -115,15 +112,12 @@ 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:= @LINUX_2_6 $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
+  DEPENDS:= $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:= \
-	$(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/ext4/ext4.ko \
+	$(LINUX_DIR)/fs/jbd2/jbd2.ko
   AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
   $(call AddDepends/crc16)
 endef
@@ -139,7 +133,7 @@ define KernelPackage/fs-hfs
   SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
   KCONFIG:=CONFIG_HFS_FS
-  FILES:=$(LINUX_DIR)/fs/hfs/hfs.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko
   AUTOLOAD:=$(call AutoLoad,30,hfs)
 $(call AddDepends/nls)
 endef
@@ -155,7 +149,7 @@ define KernelPackage/fs-hfsplus
   SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
   KCONFIG:=CONFIG_HFSPLUS_FS
-  FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.ko
   AUTOLOAD:=$(call AutoLoad,30,hfsplus)
 $(call AddDepends/nls,utf8)
 endef
@@ -171,7 +165,7 @@ define KernelPackage/fs-isofs
   SUBMENU:=$(FS_MENU)
   TITLE:=ISO9660 filesystem support
   KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
-  FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko
   AUTOLOAD:=$(call AutoLoad,30,isofs)
 $(call AddDepends/nls)
 endef
@@ -188,7 +182,7 @@ define KernelPackage/fs-mbcache
   TITLE:=mbcache (used by ext2/ext3/ext4)
   KCONFIG:=CONFIG_FS_MBCACHE
   ifneq ($(CONFIG_FS_MBCACHE),)
-    FILES:=$(LINUX_DIR)/fs/mbcache.$(LINUX_KMOD_SUFFIX)
+    FILES:=$(LINUX_DIR)/fs/mbcache.ko
     AUTOLOAD:=$(call AutoLoad,20,mbcache,1)
   endif
 endef
@@ -206,7 +200,7 @@ define KernelPackage/fs-minix
   SUBMENU:=$(FS_MENU)
   TITLE:=Minix filesystem support
   KCONFIG:=CONFIG_MINIX_FS
-  FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/minix/minix.ko
   AUTOLOAD:=$(call AutoLoad,30,minix)
 endef
 
@@ -221,15 +215,11 @@ define KernelPackage/fs-msdos
   SUBMENU:=$(FS_MENU)
   TITLE:=MSDOS filesystem support
   KCONFIG:=CONFIG_MSDOS_FS
-  FILES:=$(LINUX_DIR)/fs/fat/msdos.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/fat/msdos.ko
   AUTOLOAD:=$(call AutoLoad,40,msdos)
 $(call AddDepends/nls)
 endef
 
-define KernelPackage/fs-msdos/2.4
-  FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
-endef
-
 define KernelPackage/fs-msdos/description
  Kernel module for MSDOS filesystem support
 endef
@@ -244,7 +234,7 @@ define KernelPackage/fs-nfs
   KCONFIG:= \
 	CONFIG_NFS_FS
   FILES:= \
-	$(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/nfs/nfs.ko
   AUTOLOAD:=$(call AutoLoad,40,nfs)
 endef
 
@@ -262,8 +252,8 @@ define KernelPackage/fs-nfs-common
 	CONFIG_LOCKD \
 	CONFIG_SUNRPC
   FILES:= \
-	$(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/lockd/lockd.ko \
+	$(LINUX_DIR)/net/sunrpc/sunrpc.ko
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)
 endef
 
@@ -277,8 +267,8 @@ define KernelPackage/fs-nfs-common-v4
 	CONFIG_SUNRPC_GSS\
 	CONFIG_NFS_V4=y\
 	CONFIG_NFSD_V4=y
-  DEPENDS:= @LINUX_2_6 @BROKEN
-  FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:= @BROKEN
+  FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko
   AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
 endef
 
@@ -294,7 +284,7 @@ define KernelPackage/fs-nfsd
   TITLE:=NFS kernel server support
   DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs
   KCONFIG:=CONFIG_NFSD
-  FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko
   AUTOLOAD:=$(call AutoLoad,40,nfsd)
 endef
 
@@ -309,7 +299,7 @@ define KernelPackage/fs-ntfs
   SUBMENU:=$(FS_MENU)
   TITLE:=NTFS filesystem support
   KCONFIG:=CONFIG_NTFS_FS
-  FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko
   AUTOLOAD:=$(call AutoLoad,30,ntfs)
 $(call AddDepends/nls)
 endef
@@ -325,7 +315,7 @@ define KernelPackage/fs-reiserfs
   SUBMENU:=$(FS_MENU)
   TITLE:=ReiserFS filesystem support
   KCONFIG:=CONFIG_REISERFS_FS
-  FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko
   AUTOLOAD:=$(call AutoLoad,30,reiserfs,1)
 endef
 
@@ -340,7 +330,7 @@ define KernelPackage/fs-udf
   SUBMENU:=$(FS_MENU)
   TITLE:=UDF filesystem support
   KCONFIG:=CONFIG_UDF_FS
-  FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/udf/udf.ko
   AUTOLOAD:=$(call AutoLoad,30,udf)
 $(call AddDepends/nls)
 endef
@@ -359,18 +349,12 @@ define KernelPackage/fs-vfat
 	CONFIG_FAT_FS \
 	CONFIG_VFAT_FS
   FILES:= \
-	$(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/fs/fat/vfat.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/fat/fat.ko \
+	$(LINUX_DIR)/fs/fat/vfat.ko
   AUTOLOAD:=$(call AutoLoad,30,fat vfat)
 $(call AddDepends/nls)
 endef
 
-define KernelPackage/fs-vfat/2.4
-  FILES:= \
-	$(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
-endef
-
 define KernelPackage/fs-vfat/description
  Kernel module for VFAT filesystem support
 endef
@@ -383,7 +367,7 @@ define KernelPackage/fs-xfs
   TITLE:=XFS filesystem support
   KCONFIG:=CONFIG_XFS_FS
   DEPENDS:= +kmod-fs-exportfs
-  FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko
   AUTOLOAD:=$(call AutoLoad,30,xfs,1)
 endef