Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751134AbWEMDkt (ORCPT ); Fri, 12 May 2006 23:40:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751141AbWEMDkt (ORCPT ); Fri, 12 May 2006 23:40:49 -0400 Received: from c-67-177-57-20.hsd1.co.comcast.net ([67.177.57.20]:57075 "EHLO sshock.homelinux.net") by vger.kernel.org with ESMTP id S1751129AbWEMDks (ORCPT ); Fri, 12 May 2006 23:40:48 -0400 Date: Fri, 12 May 2006 21:40:51 -0600 From: Phillip Hellewell To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, viro@ftp.linux.org.uk, mike@halcrow.us, mhalcrow@us.ibm.com, mcthomps@us.ibm.com, toml@us.ibm.com, yoder1@us.ibm.com, James Morris , "Stephen C. Tweedie" , Erez Zadok , David Howells Subject: [PATCH 1/13: eCryptfs] fs/Makefile and fs/Kconfig Message-ID: <20060513034051.GA18631@hellewell.homeip.net> References: <20060513033742.GA18598@hellewell.homeip.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060513033742.GA18598@hellewell.homeip.net> X-URL: http://hellewell.homeip.net/ User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2320 Lines: 61 This is the 1st patch in a series of 13 constituting the kernel components of the eCryptfs cryptographic filesystem. This patch modifies the fs/Kconfig and fs/Makefile files to incorporate eCryptfs into the kernel build. Signed-off-by: Phillip Hellewell Signed-off-by: Michael Halcrow --- Kconfig | 18 ++++++++++++++++++ Makefile | 1 + 2 files changed, 19 insertions(+) Index: linux-2.6.17-rc3-mm1-ecryptfs/fs/Kconfig =================================================================== --- linux-2.6.17-rc3-mm1-ecryptfs.orig/fs/Kconfig 2006-05-02 18:05:37.000000000 -0600 +++ linux-2.6.17-rc3-mm1-ecryptfs/fs/Kconfig 2006-05-12 20:00:24.000000000 -0600 @@ -935,6 +935,24 @@ To compile this file system support as a module, choose M here: the module will be called affs. If unsure, say N. +config ECRYPT_FS + tristate "eCrypt filesystem layer support (EXPERIMENTAL)" + depends on EXPERIMENTAL && KEYS && CRYPTO + help + Encrypted filesystem that operates on the VFS layer. See + Documentation/ecryptfs.txt to learn more about eCryptfs. + + To compile this file system support as a module, choose M here: the + module will be called ecryptfs. + +config ECRYPT_DEBUG + bool "Enable eCryptfs debug mode" + depends on ECRYPT_FS + help + Turn on debugging code in eCryptfs. + + If unsure, say N. + config HFS_FS tristate "Apple Macintosh file system support (EXPERIMENTAL)" depends on EXPERIMENTAL Index: linux-2.6.17-rc3-mm1-ecryptfs/fs/Makefile =================================================================== --- linux-2.6.17-rc3-mm1-ecryptfs.orig/fs/Makefile 2006-05-02 18:05:37.000000000 -0600 +++ linux-2.6.17-rc3-mm1-ecryptfs/fs/Makefile 2006-05-12 20:00:24.000000000 -0600 @@ -68,6 +68,7 @@ obj-$(CONFIG_ISO9660_FS) += isofs/ obj-$(CONFIG_HFSPLUS_FS) += hfsplus/ # Before hfs to find wrapped HFS+ obj-$(CONFIG_HFS_FS) += hfs/ +obj-$(CONFIG_ECRYPT_FS) += ecryptfs/ obj-$(CONFIG_VXFS_FS) += freevxfs/ obj-$(CONFIG_NFS_FS) += nfs/ obj-$(CONFIG_EXPORTFS) += exportfs/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/