[PATCH v2] eCryptfs: fix compile error

[PATCH v2] eCryptfs: fix compile error

[Roberto Sassu]

[-- Attachment #1: Type: text/plain, Size: 946 bytes --]

This patch fixes the compile error reported at the address:

https://bugzilla.kernel.org/show_bug.cgi?id=40292

The problem arises when compiling eCryptfs as built-in and the 'encrypted'
key type as a module. The patch prevents this combination from being set in
the kernel configuration, by fixing the eCryptfs dependencies.

Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Reported-by: David Hill <hilld@binarystorm.net>
---
 fs/ecryptfs/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ecryptfs/Kconfig b/fs/ecryptfs/Kconfig
index 1cd6d9d..cc16562 100644
--- a/fs/ecryptfs/Kconfig
+++ b/fs/ecryptfs/Kconfig
@@ -1,6 +1,6 @@
 config ECRYPT_FS
 	tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && KEYS && CRYPTO
+	depends on EXPERIMENTAL && KEYS && CRYPTO && (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n)
 	select CRYPTO_ECB
 	select CRYPTO_CBC
 	select CRYPTO_MD5
-- 
1.7.6


[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 2061 bytes --]

Re: [PATCH v2] eCryptfs: fix compile error

[Tyler Hicks]

On Mon Aug 01, 2011 at 01:33:38PM +0200, Roberto Sassu <roberto.sassu@polito.it> wrote:
> This patch fixes the compile error reported at the address:
> 
> https://bugzilla.kernel.org/show_bug.cgi?id=40292
> 
> The problem arises when compiling eCryptfs as built-in and the 'encrypted'
> key type as a module. The patch prevents this combination from being set in
> the kernel configuration, by fixing the eCryptfs dependencies.

This patch does trick. Thanks, Roberto.

I'll get this applied and in a pull request soon.

Tyler

> 
> Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
> Reported-by: David Hill <hilld@binarystorm.net>
> ---
>  fs/ecryptfs/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/ecryptfs/Kconfig b/fs/ecryptfs/Kconfig
> index 1cd6d9d..cc16562 100644
> --- a/fs/ecryptfs/Kconfig
> +++ b/fs/ecryptfs/Kconfig
> @@ -1,6 +1,6 @@
>  config ECRYPT_FS
>  	tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
> -	depends on EXPERIMENTAL && KEYS && CRYPTO
> +	depends on EXPERIMENTAL && KEYS && CRYPTO && (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n)
>  	select CRYPTO_ECB
>  	select CRYPTO_CBC
>  	select CRYPTO_MD5
> -- 
> 1.7.6
>