kclient: fix kbuild patch, import script

diff --git a/src/kernel/import_patch_set_into_linux_git.sh b/src/kernel/import_patch_set_into_linux_git.sh
index 0ec40ceb7cdf2799cbbe11038a90b2e48c58cb5c..a468b89633be6da787d569ac4fe5991a66d98b83 100755 (executable)
--- a/src/kernel/import_patch_set_into_linux_git.sh
+++ b/src/kernel/import_patch_set_into_linux_git.sh
@@ -11,10 +11,10 @@ test -e $cephtree/src/kernel/super.h || exit 0
 mkdir fs/ceph
 mkdir fs/ceph/crush
 cp $cephtree/src/kernel/Makefile fs/ceph
+cp $cephtree/src/kernel/Kconfig fs/ceph
 cp $cephtree/src/kernel/*.[ch] fs/ceph
 cp $cephtree/src/kernel/crush/*.[ch] fs/ceph/crush
 cp $cephtree/src/kernel/ceph.txt Documentation/filesystems
-git apply $cephtree/src/kernel/kbuild.patch
 
 # build the patch sequence
 git branch -D series_start
@@ -255,6 +255,7 @@ can also be enabled via .config.
 
 EOF
 
+git apply $cephtree/src/kernel/kbuild.patch
 git add fs/ceph/Makefile
 git add fs/ceph/Kconfig
 git commit -F - <<EOF fs/Kconfig fs/ceph/Kconfig fs/Makefile fs/ceph/Makefile

diff --git a/src/kernel/kbuild.patch b/src/kernel/kbuild.patch
index 3ebcfb1e192cc4cf60ec6c2fd7109483697be89c..968fde2e6c0bce179840b444d8eac3b6510c52f8 100644 (file)
--- a/src/kernel/kbuild.patch
+++ b/src/kernel/kbuild.patch
@@ -11,11 +11,11 @@ index 93945dd..928b98b 100644
  source "fs/ncpfs/Kconfig"
  source "fs/coda/Kconfig"
 diff --git a/fs/Makefile b/fs/Makefile
-index 38bc735..624c5d2 100644
+index 38bc735..e11fa80 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -122,3 +122,4 @@ obj-$(CONFIG_DEBUG_FS)              += debugfs/
- obj-$(CONFIG_OCFS2_FS)         += ocfs2/
- obj-$(CONFIG_BTRFS_FS)         += btrfs/
+@@ -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/
++obj-$(CONFIG_CEPH_FS)         += ceph/