diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-20 05:17:39 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-02-20 05:17:39 +0000 |
| commit | babb67d87c4f53127b21b9ea720551a138099f13 (patch) | |
| tree | 713f6fbf628db55d80edfe412ef771a1b71bf400 | |
| parent | 37e505be46517d06d50144b7e6574edbd31a030f (diff) | |
| download | upstream-babb67d87c4f53127b21b9ea720551a138099f13.tar.gz upstream-babb67d87c4f53127b21b9ea720551a138099f13.tar.bz2 upstream-babb67d87c4f53127b21b9ea720551a138099f13.zip | |
[package] kernel: make NFSv4 optional and add kmods for it - patch by Peter Wagner <tripolar@gmx.at>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19772 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/modules/fs.mk | 21 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.25 | 4 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.30 | 4 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.31 | 4 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.32 | 4 |
5 files changed, 25 insertions, 12 deletions
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index fc1bd17d0d..08d814d6ab 100644 --- a/package/kernel/modules/fs.mk +++ b/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 diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index b544fe448d..3ac9274a2b 100644 --- a/target/linux/generic-2.6/config-2.6.25 +++ b/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 diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30 index 61ba5f3882..3de18d7695 100644 --- a/target/linux/generic-2.6/config-2.6.30 +++ b/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 diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31 index 6678ecc013..5d571fe664 100644 --- a/target/linux/generic-2.6/config-2.6.31 +++ b/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 diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32 index 7dcb87890b..ed632a8ed1 100644 --- a/target/linux/generic-2.6/config-2.6.32 +++ b/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 |