X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Ffs.mk;h=8b619f7475bcedcf8221efdc967313c583035a6f;hb=30e847fc498c93b2d3e80411095ffc883fc8bbee;hp=7c6e93f29e8ffe59598a700c3916e3ff1cc18494;hpb=fe89215c7445c4f3f2f2b5daa40cacac2b499d19;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 7c6e93f29e..8b619f7475 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -1,208 +1,388 @@
-FSMENU:=Filesystems
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+FS_MENU:=Filesystems
+
+define KernelPackage/fs-autofs4
+  SUBMENU:=$(FS_MENU)
+  TITLE:=AUTOFS4 filesystem support
+  KCONFIG:=CONFIG_AUTOFS4_FS 
+  FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.ko
+  AUTOLOAD:=$(call AutoLoad,30,autofs4)
+endef
+
+define KernelPackage/fs-autofs4/description
+  Kernel module for AutoFS4 support
+endef
+
+$(eval $(call KernelPackage,fs-autofs4))
+
+
+define KernelPackage/fs-btrfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=BTRFS filesystem support
+  DEPENDS:=+kmod-libcrc32c +kmod-zlib
+  KCONFIG:=\
+	CONFIG_BTRFS_FS \
+	CONFIG_BTRFS_FS_POSIX_ACL=n
+  FILES:=\
+	$(LINUX_DIR)/fs/btrfs/btrfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
+endef
+
+define KernelPackage/fs-btrfs/description
+  Kernel module for BTRFS support
+endef
+
+$(eval $(call KernelPackage,fs-btrfs))
+
 
 define KernelPackage/fs-cifs
+  SUBMENU:=$(FS_MENU)
   TITLE:=CIFS support
-  DESCRIPTION:=Kernel module for CIFS support
-  KCONFIG:=$(CONFIG_CIFS)
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_CIFS
+  FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko
   AUTOLOAD:=$(call AutoLoad,30,cifs)
-  FILES:=$(MODULES_DIR)/kernel/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX)
+$(call AddDepends/nls)
 endef
+
+define KernelPackage/fs-cifs/description
+ Kernel module for CIFS support
+endef
+
 $(eval $(call KernelPackage,fs-cifs))
 
-define KernelPackage/fs-minix
-  TITLE:=Minix filesystem support
-  DESCRIPTION:=Kernel module for Minix filesystem support
-  KCONFIG:=$(CONFIG_MINIX_FS)
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,minix)
-  FILES:=$(MODULES_DIR)/kernel/fs/minix/minix.$(LINUX_KMOD_SUFFIX)
+
+define KernelPackage/fs-exportfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=exportfs kernel server support
+  KCONFIG:=CONFIG_EXPORTFS
+  FILES=$(LINUX_DIR)/fs/exportfs/exportfs.ko
+  AUTOLOAD:=$(call AutoLoad,20,exportfs)
 endef
-$(eval $(call KernelPackage,fs-minix))
+
+define KernelPackage/fs-exportfs/description
+ Kernel module for exportfs. Needed for some other modules.
+endef
+
+$(eval $(call KernelPackage,fs-exportfs))
+
 
 define KernelPackage/fs-ext2
+  SUBMENU:=$(FS_MENU)
   TITLE:=EXT2 filesystem support
-  DESCRIPTION:=Kernel module for EXT2 filesystem support
-  KCONFIG:=$(CONFIG_EXT2_FS)
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,ext2)
-  FILES:=$(MODULES_DIR)/kernel/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_EXT2_FS
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
+  FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko
+  AUTOLOAD:=$(call AutoLoad,32,ext2,1)
 endef
-$(eval $(call KernelPackage,fs-ext2))
+
+define KernelPackage/fs-ext2/description
+ Kernel module for EXT2 filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-ext2,1))
+
 
 define KernelPackage/fs-ext3
+  SUBMENU:=$(FS_MENU)
   TITLE:=EXT3 filesystem support
-  DESCRIPTION:=Kernel module for EXT3 filesystem support
-  KCONFIG:=$(CONFIG_EXT3_FS)
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,jbd ext3)
+  KCONFIG:= \
+	CONFIG_EXT3_FS \
+	CONFIG_JBD
+  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:= \
-	$(MODULES_DIR)/kernel/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/ext3/ext3.ko \
+	$(LINUX_DIR)/fs/jbd/jbd.ko
+  AUTOLOAD:=$(call AutoLoad,31,jbd ext3,1)
+endef
+
+define KernelPackage/fs-ext3/description
+ Kernel module for EXT3 filesystem support
 endef
+
 $(eval $(call KernelPackage,fs-ext3))
 
+
+define KernelPackage/fs-ext4
+  SUBMENU:=$(FS_MENU)
+  TITLE:=EXT4 filesystem support
+  KCONFIG:= \
+	CONFIG_EXT4_FS \
+	CONFIG_JBD2
+  DEPENDS:= $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
+  FILES:= \
+	$(LINUX_DIR)/fs/ext4/ext4.ko \
+	$(LINUX_DIR)/fs/jbd2/jbd2.ko
+  AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
+  $(call AddDepends/crc16)
+endef
+
+define KernelPackage/fs-ext4/description
+ Kernel module for EXT4 filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-ext4))
+
+
+define KernelPackage/fs-hfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=HFS+ filesystem support
+  KCONFIG:=CONFIG_HFS_FS
+  FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,hfs)
+$(call AddDepends/nls)
+endef
+
+define KernelPackage/fs-hfs/description
+ Kernel module for HFS filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-hfs))
+
+
 define KernelPackage/fs-hfsplus
+  SUBMENU:=$(FS_MENU)
   TITLE:=HFS+ filesystem support
-  DESCRIPTION:=Kernel module for HFS+ filesystem support
-  DEPENDS:=+kmod-nls-base
-  KCONFIG:=$(CONFIG_HFSPLUS_FS)
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_HFSPLUS_FS
+  FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.ko
   AUTOLOAD:=$(call AutoLoad,30,hfsplus)
-  FILES:=$(MODULES_DIR)/kernel/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX)
+$(call AddDepends/nls,utf8)
 endef
+
+define KernelPackage/fs-hfsplus/description
+ Kernel module for HFS+ filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-hfsplus))
 
+
 define KernelPackage/fs-isofs
+  SUBMENU:=$(FS_MENU)
   TITLE:=ISO9660 filesystem support
-  DESCRIPTION:=Kernel module for ISO9660 filesystem support
-  DEPENDS:=+kmod-nls-base
-  KCONFIG:=$(CONFIG_ISO9660_FS)
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
+  FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko
   AUTOLOAD:=$(call AutoLoad,30,isofs)
-  FILES:=$(MODULES_DIR)/kernel/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX)
+$(call AddDepends/nls)
 endef
+
+define KernelPackage/fs-isofs/description
+ Kernel module for ISO9660 filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-isofs))
 
-define KernelPackage/fs-udf
-  TITLE:=UDF filesystem support
-  DESCRIPTION:=Kernel module for UDF filesystem support
-  DEPENDS:=+kmod-nls-base
-  KCONFIG:=$(CONFIG_UDF_FS)
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,udf)
-  FILES:=$(MODULES_DIR)/kernel/fs/udf/udf.$(LINUX_KMOD_SUFFIX)
+
+define KernelPackage/fs-mbcache
+  SUBMENU:=$(FS_MENU)
+  TITLE:=mbcache (used by ext2/ext3/ext4)
+  KCONFIG:=CONFIG_FS_MBCACHE
+  ifneq ($(CONFIG_FS_MBCACHE),)
+    FILES:=$(LINUX_DIR)/fs/mbcache.ko
+    AUTOLOAD:=$(call AutoLoad,20,mbcache,1)
+  endif
 endef
-$(eval $(call KernelPackage,fs-udf))
 
-define KernelPackage/fs-nfs
-  TITLE:=NFS filesystem support
-  DESCRIPTION:=Kernel module for NFS support
-  KCONFIG:=$(CONFIG_NFS_FS)
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs)
-  FILES:= \
-  	$(MODULES_DIR)/kernel/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) \
-  	$(MODULES_DIR)/kernel/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \
-  	$(MODULES_DIR)/kernel/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX)
+define KernelPackage/fs-mbcache/description
+ Meta Block cache used by ext2/ext3
+ This package will only be installed if extended attributes 
+ are enabled for ext2/ext3
+endef
+
+$(eval $(call KernelPackage,fs-mbcache))
+
+
+define KernelPackage/fs-minix
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Minix filesystem support
+  KCONFIG:=CONFIG_MINIX_FS
+  FILES:=$(LINUX_DIR)/fs/minix/minix.ko
+  AUTOLOAD:=$(call AutoLoad,30,minix)
+endef
+
+define KernelPackage/fs-minix/description
+ Kernel module for Minix filesystem support
 endef
-$(eval $(call KernelPackage,fs-nfs))
+
+$(eval $(call KernelPackage,fs-minix))
+
 
 define KernelPackage/fs-msdos
+  SUBMENU:=$(FS_MENU)
   TITLE:=MSDOS filesystem support
-  DESCRIPTION:=Kernel module for MSDOS filesystem support
-  DEPENDS:=+kmod-nls-base
-  KCONFIG:=$(CONFIG_MSDOS_FS)
-  SUBMENU:=$(FSMENU)
+  KCONFIG:=CONFIG_MSDOS_FS
+  FILES:=$(LINUX_DIR)/fs/fat/msdos.ko
   AUTOLOAD:=$(call AutoLoad,40,msdos)
-  FILES:= \
-	$(MODULES_DIR)/kernel/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX)
+$(call AddDepends/nls)
 endef
+
+define KernelPackage/fs-msdos/2.4
+  FILES:=$(LINUX_DIR)/fs/msdos/msdos.ko
+endef
+
+define KernelPackage/fs-msdos/description
+ Kernel module for MSDOS filesystem support
+endef
+
 $(eval $(call KernelPackage,fs-msdos))
 
-define KernelPackage/fs-vfat
-  TITLE:=VFAT filesystem support
-  DESCRIPTION:=Kernel module for VFAT filesystem support
-  DEPENDS:=+kmod-nls-base
-  KCONFIG:=$(CONFIG_VFAT_FS)
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,fat vfat)
+
+define KernelPackage/fs-nfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=NFS filesystem support
+  DEPENDS:=+kmod-fs-nfs-common
+  KCONFIG:= \
+	CONFIG_NFS_FS
   FILES:= \
-	$(MODULES_DIR)/kernel/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/nfs/nfs.ko
+  AUTOLOAD:=$(call AutoLoad,40,nfs)
 endef
-$(eval $(call KernelPackage,fs-vfat))
 
-define KernelPackage/fs-xfs
-  TITLE:=XFS filesystem support
-  DESCRIPTION:=Kernel module for XFS support
-  KCONFIG:=$(CONFIG_XFS_FS)
-  SUBMENU:=$(FSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd xfs)
+define KernelPackage/fs-nfs/description
+ Kernel module for NFS support
+endef
+
+$(eval $(call KernelPackage,fs-nfs))
+
+
+define KernelPackage/fs-nfs-common
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Common NFS filesystem modules
+  KCONFIG:= \
+	CONFIG_LOCKD \
+	CONFIG_SUNRPC
   FILES:= \
-  	$(MODULES_DIR)/kernel/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/fs/lockd/lockd.ko \
+	$(LINUX_DIR)/net/sunrpc/sunrpc.ko
+  AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)
 endef
-$(eval $(call KernelPackage,fs-xfs))
+
+$(eval $(call KernelPackage,fs-nfs-common))
 
 
-define KernelPackage/nls-base
-  TITLE:=Native Language Support
-  DESCRIPTION:=Kernel module for Native Language Support
-  KCONFIG:=$(CONFIG_NLS)
-  SUBMENU:=$(FSMENU)
-  MENU:=1
-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,nls_base)
+define KernelPackage/fs-nfs-common-v4
+  SUBMENU:=$(FS_MENU)
+  TITLE:=Common NFS V4 filesystem modules
+  KCONFIG+=\
+	CONFIG_SUNRPC_GSS\
+	CONFIG_NFS_V4=y\
+	CONFIG_NFSD_V4=y
+  DEPENDS:= @BROKEN
+  FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko
+  AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
 endef
-$(eval $(call KernelPackage,nls-base))
 
+define KernelPackage/fs-nfs-common-v4/description
+ Kernel modules for NFS V4 & NFSD V4 kernel support
+endef
+
+$(eval $(call KernelPackage,fs-nfs-common-v4))
 
-define KernelPackage/nls-cp437
-  TITLE:=Codepage 437 (United States, Canada)
-  DESCRIPTION:=Kernel module for NLS Codepage 437 (United States, Canada)
-  DEPENDS:=kmod-nls-base
-  KCONFIG:=$(CONFIG_NLS_CODEPAGE_437)
-  SUBMENU:=$(FSMENU)
-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_cp437)
+
+define KernelPackage/fs-nfsd
+  SUBMENU:=$(FS_MENU)
+  TITLE:=NFS kernel server support
+  DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs
+  KCONFIG:=CONFIG_NFSD
+  FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko
+  AUTOLOAD:=$(call AutoLoad,40,nfsd)
 endef
-$(eval $(call KernelPackage,nls-cp437))
 
+define KernelPackage/fs-nfsd/description
+ Kernel module for NFS kernel server support
+endef
 
-define KernelPackage/nls-cp850
-  TITLE:=Codepage 850 (Europe)
-  DESCRIPTION:=Kernel module for NLS Codepage 850 (Europe)
-  DEPENDS:=kmod-nls-base
-  KCONFIG:=$(CONFIG_NLS_CODEPAGE_850)
-  SUBMENU:=$(FSMENU)
-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_cp850)
+$(eval $(call KernelPackage,fs-nfsd))
+
+
+define KernelPackage/fs-ntfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=NTFS filesystem support
+  KCONFIG:=CONFIG_NTFS_FS
+  FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,ntfs)
+$(call AddDepends/nls)
 endef
-$(eval $(call KernelPackage,nls-cp850))
+
+define KernelPackage/fs-ntfs/description
+ Kernel module for NTFS filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-ntfs))
 
 
-define KernelPackage/nls-iso8859-1
-  TITLE:=ISO 8859-1 (Latin 1; Western European Languages)
-  DESCRIPTION:=Kernel module for ISO 8859-1 (Latin 1)
-  DEPENDS:=kmod-nls-base
-  KCONFIG:=$(CONFIG_NLS_ISO8859_1)
-  SUBMENU:=$(FSMENU)
-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1)
+define KernelPackage/fs-reiserfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=ReiserFS filesystem support
+  KCONFIG:=CONFIG_REISERFS_FS
+  FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,reiserfs,1)
 endef
-$(eval $(call KernelPackage,nls-iso8859-1))
 
-define KernelPackage/nls-iso8859-15
-  TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol)
-  DESCRIPTION:=Kernel module for ISO 8859-15 (Latin 9)
-  DEPENDS:=kmod-nls-base
-  KCONFIG:=$(CONFIG_NLS_ISO8859_15)
-  SUBMENU:=$(FSMENU)
-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15)
+define KernelPackage/fs-reiserfs/description
+ Kernel module for ReiserFS support
 endef
-$(eval $(call KernelPackage,nls-iso8859-15))
 
-define KernelPackage/nls-koi8r
-  TITLE:=KOI8-R (Russian)
-  DESCRIPTION:=Kernel module for KOI8-R (Russian)
-  DEPENDS:=kmod-nls-base
-  KCONFIG:=$(CONFIG_NLS_KOI8_R)
-  SUBMENU:=$(FSMENU)
-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r)
+$(eval $(call KernelPackage,fs-reiserfs))
+
+
+define KernelPackage/fs-udf
+  SUBMENU:=$(FS_MENU)
+  TITLE:=UDF filesystem support
+  KCONFIG:=CONFIG_UDF_FS
+  FILES:=$(LINUX_DIR)/fs/udf/udf.ko
+  AUTOLOAD:=$(call AutoLoad,30,udf)
+$(call AddDepends/nls)
 endef
-$(eval $(call KernelPackage,nls-koi8r))
 
-define KernelPackage/nls-utf8
-  TITLE:=UTF8
-  DESCRIPTION:=Kernel module for NLS UTF8
-  DEPENDS:=kmod-nls-base
-  KCONFIG:=$(CONFIG_NLS_UTF8)
-  SUBMENU:=$(FSMENU)
-  FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,nls_utf8)
+define KernelPackage/fs-udf/description
+ Kernel module for UDF filesystem support
 endef
-$(eval $(call KernelPackage,nls-utf8))
+
+$(eval $(call KernelPackage,fs-udf))
 
 
+define KernelPackage/fs-vfat
+  SUBMENU:=$(FS_MENU)
+  TITLE:=VFAT filesystem support
+  KCONFIG:= \
+	CONFIG_FAT_FS \
+	CONFIG_VFAT_FS
+  FILES:= \
+	$(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.ko \
+	$(LINUX_DIR)/fs/vfat/vfat.ko
+endef
+
+define KernelPackage/fs-vfat/description
+ Kernel module for VFAT filesystem support
+endef
+
+$(eval $(call KernelPackage,fs-vfat))
+
+
+define KernelPackage/fs-xfs
+  SUBMENU:=$(FS_MENU)
+  TITLE:=XFS filesystem support
+  KCONFIG:=CONFIG_XFS_FS
+  DEPENDS:= +kmod-fs-exportfs
+  FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko
+  AUTOLOAD:=$(call AutoLoad,30,xfs,1)
+endef
+
+define KernelPackage/fs-xfs/description
+ Kernel module for XFS support
+endef
+
+$(eval $(call KernelPackage,fs-xfs))