X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Ffs.mk;h=0bc0d55787b6db40c9d5f602f254cffe48e05272;hb=03a6d65c37b4dd5481da48bdf11d3f9c714a6ef4;hp=30190f8640b541de366f1843e60f641d21fcabd5;hpb=f02dad6aca839bfe4b18b8277f17073dd6c093e9;p=oweals%2Fopenwrt.git diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index 30190f8640..0bc0d55787 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,14 @@ $(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 KCONFIG:=\ - CONFIG_LIBCRC32C \ CONFIG_BTRFS_FS \ - CONFIG_BTRFS_FS_POSIX_ACL=n - # for crc32c - DEPENDS:=+kmod-crypto-core +kmod-crypto-misc + CONFIG_BTRFS_FS_POSIX_ACL=n \ + CONFIG_BTRFS_FS_CHECK_INTEGRITY=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 @@ -47,10 +45,20 @@ $(eval $(call KernelPackage,fs-btrfs)) define KernelPackage/fs-cifs SUBMENU:=$(FS_MENU) TITLE:=CIFS support - KCONFIG:=CONFIG_CIFS - FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX) + KCONFIG:= \ + CONFIG_CIFS \ + CONFIG_CIFS_DFS_UPCALL=n \ + CONFIG_CIFS_UPCALL=n + FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko AUTOLOAD:=$(call AutoLoad,30,cifs) -$(call AddDepends/nls) + $(call AddDepends/nls) + DEPENDS+= \ + +kmod-crypto-arc4 \ + +kmod-crypto-hmac \ + +kmod-crypto-md5 \ + +kmod-crypto-md4 \ + +kmod-crypto-des \ + +kmod-crypto-ecb endef define KernelPackage/fs-cifs/description @@ -64,7 +72,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 @@ -75,56 +83,17 @@ endef $(eval $(call KernelPackage,fs-exportfs)) -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) - AUTOLOAD:=$(call AutoLoad,32,ext2,1) -endef - -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 - KCONFIG:= \ - CONFIG_EXT3_FS \ - CONFIG_JBD - DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) - FILES:= \ - $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) - 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_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) FILES:= \ - $(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1) + $(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) endef @@ -135,13 +104,28 @@ endef $(eval $(call KernelPackage,fs-ext4)) +define KernelPackage/fuse + SUBMENU:=$(FS_MENU) + TITLE:=FUSE (Filesystem in Userspace) support + KCONFIG:= CONFIG_FUSE_FS + FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko + AUTOLOAD:=$(call AutoLoad,80,fuse) +endef + +define KernelPackage/fuse/description + Kernel module for userspace filesystem support +endef + +$(eval $(call KernelPackage,fuse)) + + 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) + $(call AddDepends/nls) endef define KernelPackage/fs-hfs/description @@ -155,9 +139,9 @@ 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) + $(call AddDepends/nls,utf8) endef define KernelPackage/fs-hfsplus/description @@ -171,9 +155,9 @@ 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) + $(call AddDepends/nls) endef define KernelPackage/fs-isofs/description @@ -183,30 +167,11 @@ endef $(eval $(call KernelPackage,fs-isofs)) -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.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,20,mbcache,1) - endif -endef - -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.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/minix/minix.ko AUTOLOAD:=$(call AutoLoad,30,minix) endef @@ -221,13 +186,9 @@ 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) + $(call AddDepends/nls) endef define KernelPackage/fs-msdos/description @@ -242,9 +203,11 @@ define KernelPackage/fs-nfs TITLE:=NFS filesystem support DEPENDS:=+kmod-fs-nfs-common KCONFIG:= \ - CONFIG_NFS_FS + CONFIG_NFS_FS \ + CONFIG_NFS_USE_LEGACY_DNS=n \ + CONFIG_NFS_USE_NEW_IDMAPPER=n FILES:= \ - $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/nfs/nfs.ko AUTOLOAD:=$(call AutoLoad,40,nfs) endef @@ -262,8 +225,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 +240,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 @@ -293,8 +256,10 @@ 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.$(LINUX_KMOD_SUFFIX) + KCONFIG:= \ + CONFIG_NFSD \ + CONFIG_NFSD_FAULT_INJECTION=n + FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko AUTOLOAD:=$(call AutoLoad,40,nfsd) endef @@ -309,9 +274,9 @@ 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) + $(call AddDepends/nls) endef define KernelPackage/fs-ntfs/description @@ -325,7 +290,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,9 +305,10 @@ 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) + DEPENDS:=+kmod-lib-crc-itu-t + $(call AddDepends/nls) endef define KernelPackage/fs-udf/description @@ -359,16 +325,10 @@ 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) + $(call AddDepends/nls) endef define KernelPackage/fs-vfat/description @@ -382,8 +342,8 @@ 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.$(LINUX_KMOD_SUFFIX) + DEPENDS:= +kmod-fs-exportfs @!avr32 + FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko AUTOLOAD:=$(call AutoLoad,30,xfs,1) endef