kernel: make NFSv4 optional and add kmods for it - patch by Peter Wagner <tripolar@gmx.at>

SVN-Revision: 19772

package/kernel/modules/fs.mk

@@ -214,13 +214,26 @@ define KernelPackage/fs-nfs-common
   AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd)
 endef
 
-define KernelPackage/fs-nfs-common/2.6
-  KCONFIG+=CONFIG_SUNRPC_GSS
+$(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:= @LINUX_2_6 +kmod-fs-nfs-common
   FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD=$(call AutoLoad,30,sunrpc lockd auth_rpcgss)
+  AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
 endef
 
-$(eval $(call KernelPackage,fs-nfs-common))
+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-nfs

target/linux/generic-2.6/config-2.6.25

@@ -1073,11 +1073,11 @@ CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFTL is not set
 # CONFIG_NLS_ASCII is not set
 # CONFIG_NLS_CODEPAGE_1250 is not set

target/linux/generic-2.6/config-2.6.30

@@ -1442,11 +1442,11 @@ CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFTL is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NL80211=y

target/linux/generic-2.6/config-2.6.31

@@ -1446,12 +1446,12 @@ CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFTL is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NL80211=y

target/linux/generic-2.6/config-2.6.32

@@ -1515,12 +1515,12 @@ CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFTL is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NL80211=y