This patch removes the NFSv4 package and makes NFSv4 support a
configuration option for existing packages.
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -220,7 +220,7 @@ $(eval $(call KernelPackage,fs-msdos))
define KernelPackage/fs-nfs
SUBMENU:=$(FS_MENU)
TITLE:=NFS filesystem support
- DEPENDS:=+kmod-fs-nfs-common
+ DEPENDS:=+kmod-fs-nfs-common +kmod-dns-resolver
KCONFIG:= \
CONFIG_NFS_FS \
CONFIG_NFS_USE_LEGACY_DNS=n \
@@ -234,12 +234,24 @@ define KernelPackage/fs-nfs/description
Kernel module for NFS support
endef
+define KernelPackage/fs-nfs/config
+ if PACKAGE_kmod-fs-nfs
+ config KERNEL_NFS_V4
+ bool "Support NFSv4 in NFS client"
+ depends on PACKAGE_kmod-fs-sunrpc-auth-rpcgss
+ default n
+ help
+ Select this option to support NFSv4 in the NFS server
+ endif
+endef
+
$(eval $(call KernelPackage,fs-nfs))
define KernelPackage/fs-nfs-common
SUBMENU:=$(FS_MENU)
TITLE:=Common NFS filesystem modules
+ DEPENDS:=+kmod-lib-oid-registry
KCONFIG:= \
CONFIG_LOCKD \
CONFIG_SUNRPC
@@ -252,36 +264,41 @@ endef
$(eval $(call KernelPackage,fs-nfs-common))
-define KernelPackage/fs-nfs-common-v4
+define KernelPackage/fs-sunrpc-auth-rpcgss
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-nfs-common-v4/description
- Kernel modules for NFS V4 & NFSD V4 kernel support
+ TITLE:=GSS authentication for SUN RPC
+ DEPENDS:=+kmod-fs-nfs-common
+ KCONFIG:=CONFIG_SUNRPC_GSS
+ FILES:= \
+ $(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko
+ AUTOLOAD:=$(call AutoLoad,30,auth_rpcgss)
endef
-$(eval $(call KernelPackage,fs-nfs-common-v4))
+$(eval $(call KernelPackage,fs-sunrpc-auth-rpcgss))
define KernelPackage/fs-nfsd
SUBMENU:=$(FS_MENU)
TITLE:=NFS kernel server support
- DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs
- KCONFIG:= \
+ DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs
+kmod-fs-sunrpc-auth-rpcgss
+ KCONFIG= \
CONFIG_NFSD \
CONFIG_NFSD_FAULT_INJECTION=n
FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko
AUTOLOAD:=$(call AutoLoad,40,nfsd)
endef
+define KernelPackage/fs-nfsd/config
+ if PACKAGE_kmod-fs-nfsd
+ config KERNEL_NFSD_V4
+ bool "Support NFSv4 in NFS server"
+ depends on PACKAGE_kmod-fs-sunrpc-auth-rpcgss
+ default n
+ help
+ Select this option to support NFSv4 in the NFS server
+ endif
+endef
+
define KernelPackage/fs-nfsd/description
Kernel module for NFS kernel server support
endef
diff --git a/package/kernel/linux/modules/lib.mk
b/package/kernel/linux/modules/lib.mk
index af53627..66ae69c 100644
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -195,3 +195,18 @@ define KernelPackage/lib-cordic/description
endef
$(eval $(call KernelPackage,lib-cordic))
+
+define KernelPackage/lib-oid-registry
+ SUBMENU:=$(LIB_MENU)
+ TITLE:=OID-Registry function support
+ KCONFIG:=CONFIG_OID_REGISTRY
+ FILES:=$(LINUX_DIR)/lib/oid_registry.ko
+ AUTOLOAD:=$(call AutoProbe,oid-registry)
+endef
+
+define KernelPackage/lib-oid-registry/description
+ Kernel module for OID-Registry function support
+endef
+
+$(eval $(call KernelPackage,lib-oid-registry))
+
diff --git a/package/kernel/linux/modules/netsupport.mk
b/package/kernel/linux/modules/netsupport.mk
index 6f61630..2f0defc 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -938,3 +938,17 @@ endef
$(eval $(call KernelPackage,slip))
+define KernelPackage/dns-resolver
+ SUBMENU:=$(NETWORK_SUPPORT_MENU)
+ TITLE:=DNS-resolver modules
+ KCONFIG:=CONFIG_DNS_RESOLVER
+ FILES:= \
+ $(LINUX_DIR)/net/dns_resolver/dns_resolver.ko
+endef
+
+define KernelPackage/dns-resolver/description
+ Kernel modules for DNS-RESOLVER support
+endef
+
+$(eval $(call KernelPackage,dns-resolver))
+
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
