X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Ffs.mk;h=d59bf7e0ea526209303bd61d97e298bdddaa1f3c;hb=fb1297dd1ff528abfa136ac800c85e47e546ce50;hp=cf8641112787790534129247ebe2a3cdb05878fc;hpb=81bcc8cf96bfd52e94cba754a4f2ddab0c0e6e4d;p=openwrt%2Fstaging%2Fjogo.git diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index cf86411127..d59bf7e0ea 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -1,80 +1,91 @@ # -# Copyright (C) 2006 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. # -# $Id$ FS_MENU:=Filesystems -define KernelPackage/nls/Depends - ifneq ($(KERNEL),2.4) - DEPENDS+= +kmod-nls-base $(foreach m,$(1),+kmod-nls-$(m)) - endif +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-cifs - SUBMENU:=$(FS_MENU) - TITLE:=CIFS support - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_CIFS - FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,cifs) -$(call KernelPackage/nls/Depends) +define KernelPackage/fs-autofs4/description + Kernel module for AutoFS4 support endef +$(eval $(call KernelPackage,fs-autofs4)) -define KernelPackage/fs-cifs/description - Kernel module for CIFS support + +define KernelPackage/fs-btrfs + SUBMENU:=$(FS_MENU) + TITLE:=BTRFS filesystem support + DEPENDS:=+kmod-libcrc32c +!(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_36||LINUX_2_6_37):kmod-lib-lzo +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 -$(eval $(call KernelPackage,fs-cifs)) +define KernelPackage/fs-btrfs/description + Kernel module for BTRFS support +endef +$(eval $(call KernelPackage,fs-btrfs)) -define KernelPackage/fs-minix + +define KernelPackage/fs-cifs SUBMENU:=$(FS_MENU) - TITLE:=Minix filesystem support - KCONFIG:=CONFIG_MINIX_FS - FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,minix) + TITLE:=CIFS support + KCONFIG:=CONFIG_CIFS + FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko + AUTOLOAD:=$(call AutoLoad,30,cifs) +$(call AddDepends/nls) endef -define KernelPackage/fs-minix/description - Kernel module for Minix filesystem support +define KernelPackage/fs-cifs/description + Kernel module for CIFS support endef -$(eval $(call KernelPackage,fs-minix)) +$(eval $(call KernelPackage,fs-cifs)) -define KernelPackage/fs-ntfs +define KernelPackage/fs-exportfs SUBMENU:=$(FS_MENU) - TITLE:=NTFS filesystem support - KCONFIG:=CONFIG_NTFS_FS - FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,ntfs) + TITLE:=exportfs kernel server support + KCONFIG:=CONFIG_EXPORTFS + FILES=$(LINUX_DIR)/fs/exportfs/exportfs.ko + AUTOLOAD:=$(call AutoLoad,20,exportfs) endef -define KernelPackage/fs-ntfs/description - Kernel module for NTFS filesystem support +define KernelPackage/fs-exportfs/description + Kernel module for exportfs. Needed for some other modules. endef -$(eval $(call KernelPackage,fs-ntfs)) +$(eval $(call KernelPackage,fs-exportfs)) define KernelPackage/fs-ext2 SUBMENU:=$(FS_MENU) TITLE:=EXT2 filesystem support KCONFIG:=CONFIG_EXT2_FS - FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,ext2) + DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31 + FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko + AUTOLOAD:=$(call AutoLoad,32,ext2,1) endef define KernelPackage/fs-ext2/description Kernel module for EXT2 filesystem support endef -$(eval $(call KernelPackage,fs-ext2)) +$(eval $(call KernelPackage,fs-ext2,1)) define KernelPackage/fs-ext3 @@ -83,11 +94,11 @@ define KernelPackage/fs-ext3 KCONFIG:= \ CONFIG_EXT3_FS \ CONFIG_JBD + DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31 FILES:= \ - $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/mbcache.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,mbcache jbd ext3) + $(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 @@ -97,14 +108,39 @@ endef $(eval $(call KernelPackage,fs-ext3)) +define KernelPackage/fs-ext4 + SUBMENU:=$(FS_MENU) + TITLE:=EXT4 filesystem support + KCONFIG:= \ + CONFIG_EXT4_FS \ + CONFIG_JBD2 + FILES:= \ + $(LINUX_DIR)/fs/ext4/ext4.ko \ + $(LINUX_DIR)/fs/jbd2/jbd2.ko + ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),1) + FILES+= \ + $(LINUX_DIR)/fs/mbcache.ko + AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1) + else + AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1) + endif + $(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 - DEPENDS:=+kmod-nls-base 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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef define KernelPackage/fs-hfs/description @@ -117,14 +153,12 @@ $(eval $(call KernelPackage,fs-hfs)) define KernelPackage/fs-hfsplus SUBMENU:=$(FS_MENU) TITLE:=HFS+ filesystem support - DEPENDS:=+kmod-nls-base 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 KernelPackage/nls/Depends,utf8) +$(call AddDepends/nls,utf8) endef - define KernelPackage/fs-hfsplus/description Kernel module for HFS+ filesystem support endef @@ -136,12 +170,11 @@ 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 KernelPackage/nls/Depends) +$(call AddDepends/nls) endef - define KernelPackage/fs-isofs/description Kernel module for ISO9660 filesystem support endef @@ -149,36 +182,46 @@ endef $(eval $(call KernelPackage,fs-isofs)) -define KernelPackage/fs-udf +define KernelPackage/fs-minix SUBMENU:=$(FS_MENU) - TITLE:=UDF filesystem support - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_UDF_FS - FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,udf) -$(call KernelPackage/nls/Depends) + 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-minix)) + -define KernelPackage/fs-udf/description - Kernel module for UDF filesystem support +define KernelPackage/fs-msdos + SUBMENU:=$(FS_MENU) + TITLE:=MSDOS filesystem support + KCONFIG:=CONFIG_MSDOS_FS + FILES:=$(LINUX_DIR)/fs/fat/msdos.ko + AUTOLOAD:=$(call AutoLoad,40,msdos) +$(call AddDepends/nls) endef -$(eval $(call KernelPackage,fs-udf)) +define KernelPackage/fs-msdos/description + Kernel module for MSDOS filesystem support +endef + +$(eval $(call KernelPackage,fs-msdos)) define KernelPackage/fs-nfs SUBMENU:=$(FS_MENU) TITLE:=NFS filesystem support + DEPENDS:=+kmod-fs-nfs-common KCONFIG:= \ - CONFIG_NFS_FS \ - CONFIG_LOCKD \ - CONFIG_SUNRPC + CONFIG_NFS_FS FILES:= \ - $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs) + $(LINUX_DIR)/fs/nfs/nfs.ko + AUTOLOAD:=$(call AutoLoad,40,nfs) endef define KernelPackage/fs-nfs/description @@ -188,20 +231,47 @@ endef $(eval $(call KernelPackage,fs-nfs)) -define KernelPackage/fs-nfsd +define KernelPackage/fs-nfs-common SUBMENU:=$(FS_MENU) - TITLE:=NFS kernel server support + TITLE:=Common NFS filesystem modules KCONFIG:= \ - CONFIG_NFSD \ - CONFIG_EXPORTFS - FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,40,nfsd) + CONFIG_LOCKD \ + CONFIG_SUNRPC + FILES:= \ + $(LINUX_DIR)/fs/lockd/lockd.ko \ + $(LINUX_DIR)/net/sunrpc/sunrpc.ko + AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd) +endef + +$(eval $(call KernelPackage,fs-nfs-common)) + + +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 -define KernelPackage/fs-nfsd/2.6 -# KCONFIG+=CONFIG_EXPORTFS - FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+=$(call AutoLoad,30,exportfs) +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/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 define KernelPackage/fs-nfsd/description @@ -211,30 +281,28 @@ endef $(eval $(call KernelPackage,fs-nfsd)) -define KernelPackage/fs-msdos +define KernelPackage/fs-ntfs SUBMENU:=$(FS_MENU) - TITLE:=MSDOS filesystem support - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_MSDOS_FS - FILES:=$(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,40,msdos) -$(call KernelPackage/nls/Depends) + TITLE:=NTFS filesystem support + KCONFIG:=CONFIG_NTFS_FS + FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko + AUTOLOAD:=$(call AutoLoad,30,ntfs) +$(call AddDepends/nls) endef - -define KernelPackage/fs-msdos/description - Kernel module for MSDOS filesystem support +define KernelPackage/fs-ntfs/description + Kernel module for NTFS filesystem support endef -$(eval $(call KernelPackage,fs-msdos)) +$(eval $(call KernelPackage,fs-ntfs)) define KernelPackage/fs-reiserfs SUBMENU:=$(FS_MENU) TITLE:=ReiserFS filesystem support KCONFIG:=CONFIG_REISERFS_FS - FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,reiserfs) + FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko + AUTOLOAD:=$(call AutoLoad,30,reiserfs,1) endef define KernelPackage/fs-reiserfs/description @@ -244,6 +312,22 @@ endef $(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 + +define KernelPackage/fs-udf/description + Kernel module for UDF filesystem support +endef + +$(eval $(call KernelPackage,fs-udf)) + + define KernelPackage/fs-vfat SUBMENU:=$(FS_MENU) TITLE:=VFAT filesystem support @@ -251,13 +335,12 @@ define KernelPackage/fs-vfat CONFIG_FAT_FS \ CONFIG_VFAT_FS FILES:= \ - $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/fat/fat.ko \ + $(LINUX_DIR)/fs/fat/vfat.ko AUTOLOAD:=$(call AutoLoad,30,fat vfat) -$(call KernelPackage/nls/Depends) +$(call AddDepends/nls) endef - define KernelPackage/fs-vfat/description Kernel module for VFAT filesystem support endef @@ -269,8 +352,9 @@ define KernelPackage/fs-xfs SUBMENU:=$(FS_MENU) TITLE:=XFS filesystem support KCONFIG:=CONFIG_XFS_FS - FILES:=$(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,xfs) + DEPENDS:= +kmod-fs-exportfs + FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko + AUTOLOAD:=$(call AutoLoad,30,xfs,1) endef define KernelPackage/fs-xfs/description @@ -278,161 +362,3 @@ define KernelPackage/fs-xfs/description endef $(eval $(call KernelPackage,fs-xfs)) - - -define KernelPackage/nls-base - SUBMENU:=$(FS_MENU) - TITLE:=Native Language Support - KCONFIG:=CONFIG_NLS - FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,20,nls_base) -endef - -define KernelPackage/nls-base/description - Kernel module for NLS (Native Language Support) -endef - -$(eval $(call KernelPackage,nls-base)) - - -define KernelPackage/nls-cp437 - SUBMENU:=$(FS_MENU) - TITLE:=Codepage 437 (United States, Canada) - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_NLS_CODEPAGE_437 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,nls_cp437) -$(call KernelPackage/nls/Depends) -endef - - -define KernelPackage/nls-cp437/description - Kernel module for NLS Codepage 437 (United States, Canada) -endef - -$(eval $(call KernelPackage,nls-cp437)) - - -define KernelPackage/nls-cp850 - SUBMENU:=$(FS_MENU) - TITLE:=Codepage 850 (Europe) - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_NLS_CODEPAGE_850 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,nls_cp850) -$(call KernelPackage/nls/Depends) -endef - - -define KernelPackage/nls-cp850/description - Kernel module for NLS Codepage 850 (Europe) -endef - -$(eval $(call KernelPackage,nls-cp850)) - - -define KernelPackage/nls-cp1250 - SUBMENU:=$(FS_MENU) - TITLE:=Codepage 1250 (Eastern Europe) - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_NLS_CODEPAGE_1250 - FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,nls_cp1250) -$(call KernelPackage/nls/Depends) -endef - - -define KernelPackage/nls-cp1250/description - Kernel module for NLS Codepage 1250 (Eastern Europe) -endef - -$(eval $(call KernelPackage,nls-cp1250)) - - -define KernelPackage/nls-iso8859-1 - SUBMENU:=$(FS_MENU) - TITLE:=ISO 8859-1 (Latin 1; Western European Languages) - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_NLS_ISO8859_1 - FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1) -$(call KernelPackage/nls/Depends) -endef - - -define KernelPackage/nls-iso8859-1/description - Kernel module for NLS ISO 8859-1 (Latin 1) -endef - -$(eval $(call KernelPackage,nls-iso8859-1)) - - -define KernelPackage/nls-iso8859-2 - SUBMENU:=$(FS_MENU) - TITLE:=ISO 8859-2 (Latin 2; Central European Languages) - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_NLS_ISO8859_2 - FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-2.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-2) -$(call KernelPackage/nls/Depends) -endef - - -define KernelPackage/nls-iso8859-2/description - Kernel module for NLS ISO 8859-2 (Latin 2) -endef - -$(eval $(call KernelPackage,nls-iso8859-2)) - - -define KernelPackage/nls-iso8859-15 - SUBMENU:=$(FS_MENU) - TITLE:=ISO 8859-15 (Latin 9; Western, with Euro symbol) - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_NLS_ISO8859_15 - FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15) -$(call KernelPackage/nls/Depends) -endef - - -define KernelPackage/nls-iso8859-15/description - Kernel module for NLS ISO 8859-15 (Latin 9) -endef - -$(eval $(call KernelPackage,nls-iso8859-15)) - - -define KernelPackage/nls-koi8r - SUBMENU:=$(FS_MENU) - TITLE:=KOI8-R (Russian) - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_NLS_KOI8_R - FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r) -$(call KernelPackage/nls/Depends) -endef - - -define KernelPackage/nls-koi8r/description - Kernel module for NLS KOI8-R (Russian) -endef - -$(eval $(call KernelPackage,nls-koi8r)) - - -define KernelPackage/nls-utf8 - SUBMENU:=$(FS_MENU) - TITLE:=UTF-8 - DEPENDS:=+kmod-nls-base - KCONFIG:=CONFIG_NLS_UTF8 - FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,nls_utf8) -$(call KernelPackage/nls/Depends) -endef - -define KernelPackage/nls-utf8/description - Kernel module for NLS UTF-8 -endef - -$(eval $(call KernelPackage,nls-utf8))