Просмотр исходного кода

disable rpc/nfs4 for nfsroot target, fix allmodconfig

Waldemar Brodkorb 14 лет назад
Родитель
Сommit
c113ffbfb2
3 измененных файлов с 9 добавлено и 0 удалено
  1. 1 0
      target/Config.in
  2. 5 0
      target/linux/config/Config.in.crypto
  3. 3 0
      target/linux/config/Config.in.fsnet

+ 1 - 0
target/Config.in

@@ -733,6 +733,7 @@ config ADK_TARGET_ROOTFS_NFSROOT
 		ADK_LINUX_MIPS_WAG54G || \
 		ADK_LINUX_MIPS_AG241 || \
 		ADK_LINUX_MIPS64_LEMOTE
+	select ADK_KERNEL_SUNRPC
 	select ADK_KERNEL_NFS_FS
 	select ADK_KERNEL_NFS_V3
 	select ADK_KERNEL_ROOT_NFS

+ 5 - 0
target/linux/config/Config.in.crypto

@@ -15,6 +15,10 @@ config ADK_KERNEL_OCF_CRYPTODEV
 	boolean
 	default n
 
+config ADK_KERNEL_CRYPTO_MANAGER
+	tristate
+	default n
+
 config ADK_KERNEL_OCF_OCF
 	boolean
 	default n
@@ -125,6 +129,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
 	prompt "kmod-crypto-manager.................. Crypto algorithm manager"
 	tristate
 	default n
+	depends on !ADK_KERNEL_CRYPTO_MANAGER
 	select ADK_KPACKAGE_KMOD_CRYPTO_HASH
 	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
 	select ADK_KPACKAGE_KMOD_CRYPTO_AEAD

+ 3 - 0
target/linux/config/Config.in.fsnet

@@ -97,6 +97,7 @@ config ADK_KPACKAGE_KMOD_NFSD
 	select ADK_KERNEL_NFSD_V3
 	select ADK_KPACKAGE_KMOD_SUNRPC
 	select ADK_KPACKAGE_KMOD_LOCKD
+	depends on !ADK_TARGET_ROOTFS_NFSROOT
 	help
 	  If you want your Linux box to act as an NFS *server*, so that other
 	  computers on your local network which support NFS can access certain
@@ -120,6 +121,7 @@ config ADK_KPACKAGE_KMOD_NFSD
 config ADK_KERNEL_NFSD_V4
 	prompt "Enable NFSv4 and RPC Kerberos"
 	boolean
+	depends on !ADK_TARGET_ROOTFS_NFSROOT
 	depends on ADK_KPACKAGE_KMOD_NFSD
 	select ADK_KPACKAGE_KMOD_SUNRPC_GSS
 	select ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5
@@ -134,6 +136,7 @@ config ADK_KPACKAGE_KMOD_LOCKD
 
 config ADK_KPACKAGE_KMOD_SUNRPC
 	tristate
+	depends on !ADK_KERNEL_SUNRPC
 	default n
 
 config ADK_KPACKAGE_KMOD_SUNRPC_GSS