upgrade busybox to v1.11.1 and add current upstream fixes

[openwrt.git] / package / kernel / modules / fs.mk

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index b3b7d3d..a7829d5 100644 (file)
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -180,19 +180,30 @@ endef
 
 $(eval $(call KernelPackage,fs-udf))
 
 
 $(eval $(call KernelPackage,fs-udf))
 

-
-define KernelPackage/fs-nfs
+define KernelPackage/fs-nfs-common

   SUBMENU:=$(FS_MENU)
   SUBMENU:=$(FS_MENU)

-  TITLE:=NFS filesystem support
+  TITLE:=Common NFS filesystem modules

   KCONFIG:= \
   KCONFIG:= \

-       CONFIG_NFS_FS \

        CONFIG_LOCKD \
        CONFIG_SUNRPC
   FILES:= \
        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)
        $(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
 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
 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
   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
 endef
 
 define KernelPackage/fs-nfsd/description