From c113ffbfb2c9b71980d0b84456ea8df2209da6c1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Feb 2010 16:26:58 +0100 Subject: disable rpc/nfs4 for nfsroot target, fix allmodconfig --- target/linux/config/Config.in.crypto | 5 +++++ target/linux/config/Config.in.fsnet | 3 +++ 2 files changed, 8 insertions(+) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index 7d78a594e..ef0be06a3 100644 --- a/target/linux/config/Config.in.crypto +++ b/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 diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 1db9d72b6..432415dd1 100644 --- a/target/linux/config/Config.in.fsnet +++ b/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 -- cgit v1.2.3