From 0d23c0923e2428cfeababbe0ea16120ed69d3ce3 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 25 Feb 2009 14:34:55 -0800
Subject: [PATCH] kclient: separate Kconfig

---
 src/Makefile.am                               |  2 +
 src/kernel/Kconfig                            | 20 +++++++++
 src/kernel/import_patch_set_into_linux_git.sh |  3 +-
 src/kernel/kbuild.patch                       | 43 ++++++-------------
 4 files changed, 36 insertions(+), 32 deletions(-)
 create mode 100644 src/kernel/Kconfig

diff --git a/src/Makefile.am b/src/Makefile.am
index d75182d672fa7..d063d0a97ce54 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -351,6 +351,7 @@ noinst_HEADERS = \
         include/uofs.h\
         include/utime.h\
         include/xlist.h\
+	kernel/Kconfig\
         kernel/Makefile\
 	kernel/addr.c\
 	kernel/caps.c\
@@ -370,6 +371,7 @@ noinst_HEADERS = \
 	kernel/inode.c\
 	kernel/ioctl.c\
 	kernel/ioctl.h\
+	kernel/kbuild.patch\
 	kernel/mds_client.c\
 	kernel/mds_client.h\
 	kernel/mdsmap.c\
diff --git a/src/kernel/Kconfig b/src/kernel/Kconfig
new file mode 100644
index 0000000000000..874657549909a
--- /dev/null
+++ b/src/kernel/Kconfig
@@ -0,0 +1,20 @@
+config CEPH_FS
+        tristate "Ceph distributed file system (EXPERIMENTAL)"
+	depends on INET && EXPERIMENTAL
+	select LIBCRC32C
+	help
+	  Choose Y or M here to include support for mounting the
+	  experimental Ceph distributed file system.  Ceph is an extremely
+	  scalable file system designed to provide high performance,
+	  reliable access to petabytes of storage.
+
+	  More information at http://ceph.newdream.net/.
+
+	  If unsure, say N.
+
+config CEPH_BOOKKEEPER
+	bool "Ceph leaks detection tool"
+	depends on CEPH_FS
+	help
+	  Leaks detection tool for the Ceph fs.
+
diff --git a/src/kernel/import_patch_set_into_linux_git.sh b/src/kernel/import_patch_set_into_linux_git.sh
index e7eb3a7c840d8..0ec40ceb7cdf2 100755
--- a/src/kernel/import_patch_set_into_linux_git.sh
+++ b/src/kernel/import_patch_set_into_linux_git.sh
@@ -256,7 +256,8 @@ can also be enabled via .config.
 EOF
 
 git add fs/ceph/Makefile
-git commit -F - <<EOF fs/Kconfig fs/Makefile fs/ceph/Makefile
+git add fs/ceph/Kconfig
+git commit -F - <<EOF fs/Kconfig fs/ceph/Kconfig fs/Makefile fs/ceph/Makefile
 ceph: Kconfig, Makefile
 
 Kconfig options and Makefile.
diff --git a/src/kernel/kbuild.patch b/src/kernel/kbuild.patch
index 6f09bdc62d189..3ebcfb1e192cc 100644
--- a/src/kernel/kbuild.patch
+++ b/src/kernel/kbuild.patch
@@ -1,40 +1,21 @@
 diff --git a/fs/Kconfig b/fs/Kconfig
-index e46297f..578db91 100644
+index 93945dd..928b98b 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -1407,6 +1407,26 @@ config RPCSEC_GSS_SPKM3
+@@ -266,6 +266,7 @@ config NFS_COMMON
  
- 	  If unsure, say N.
- 
-+config CEPH_FS
-+        tristate "Ceph distributed file system (EXPERIMENTAL)"
-+	depends on INET && EXPERIMENTAL
-+	select LIBCRC32C
-+	help
-+	  Choose Y or M here to include support for mounting the
-+	  experimental Ceph distributed file system.  Ceph is an extremely
-+	  scalable file system designed to provide high performance,
-+	  reliable access to petabytes of storage.
-+
-+	  More information at http://ceph.newdream.net/.
-+
-+	  If unsure, say N.
-+
-+config CEPH_BOOKKEEPER
-+	bool "Ceph leaks detection tool"
-+	depends on CEPH_FS
-+	help
-+	  Leaks detection tool for the Ceph fs.
-+
- config SMB_FS
- 	tristate "SMB file system support (OBSOLETE, please use CIFS)"
- 	depends on INET
+ source "net/sunrpc/Kconfig"
+ source "fs/smbfs/Kconfig"
++source "fs/ceph/Kconfig"
+ source "fs/cifs/Kconfig"
+ source "fs/ncpfs/Kconfig"
+ source "fs/coda/Kconfig"
 diff --git a/fs/Makefile b/fs/Makefile
-index 2168c90..c12196e 100644
+index 38bc735..624c5d2 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -124,3 +124,4 @@ obj-$(CONFIG_HPPFS)		+= hppfs/
- obj-$(CONFIG_DEBUG_FS)		+= debugfs/
- obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
+@@ -122,3 +122,4 @@ obj-$(CONFIG_DEBUG_FS)              += debugfs/
+ obj-$(CONFIG_OCFS2_FS)         += ocfs2/
+ obj-$(CONFIG_BTRFS_FS)         += btrfs/
  obj-$(CONFIG_GFS2_FS)           += gfs2/
 +obj-$(CONFIG_CEPH_FS)           += ceph/
-- 
2.39.5