X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cb7eb76c556dd70a4cf923461bfb34c402c0b270..35784d8fa82da285870a45bc85d8988b53ff061f:/package/kernel/modules/fs.mk?ds=inline diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index b3b7d3d66..176fed6d4 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -180,19 +180,30 @@ endef $(eval $(call KernelPackage,fs-udf)) - -define KernelPackage/fs-nfs +define KernelPackage/fs-nfs-common SUBMENU:=$(FS_MENU) - TITLE:=NFS filesystem support + TITLE:=Common NFS filesystem modules KCONFIG:= \ - CONFIG_NFS_FS \ CONFIG_LOCKD \ CONFIG_SUNRPC 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) + AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd) +endef + +$(eval $(call KernelPackage,fs-nfs-common)) + + +define KernelPackage/fs-nfs + SUBMENU:=$(FS_MENU) + TITLE:=NFS filesystem support + DEPENDS:=kmod-fs-nfs-common + KCONFIG:= \ + CONFIG_NFS_FS + FILES:= \ + $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,40,nfs) endef define KernelPackage/fs-nfs/description @@ -205,17 +216,18 @@ $(eval $(call KernelPackage,fs-nfs)) define KernelPackage/fs-nfsd SUBMENU:=$(FS_MENU) TITLE:=NFS kernel server support - KCONFIG:= \ - CONFIG_NFSD \ - CONFIG_EXPORTFS + DEPENDS:=kmod-fs-nfs-common + KCONFIG:=CONFIG_NFSD FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,nfsd) endef define KernelPackage/fs-nfsd/2.6 -# KCONFIG+=CONFIG_EXPORTFS - FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX) - AUTOLOAD+=$(call AutoLoad,30,exportfs) + KCONFIG+=CONFIG_EXPORTFS \ + CONFIG_SUNRPC_GSS + FILES+=$(LINUX_DIR)/fs/exportfs/exportfs.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX) + AUTOLOAD+=$(call AutoLoad,40,auth_rpcgss exportfs nfsd) endef define KernelPackage/fs-nfsd/description @@ -265,7 +277,7 @@ define KernelPackage/fs-vfat CONFIG_VFAT_FS FILES:= \ $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/$(if $(CONFIG_LINUX_2_6_28),fat,vfat)/vfat.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,fat vfat) $(call KernelPackage/nls/Depends) endef