From 0cd53b65ef4605e1aeeab2d46e20cb14990cab12 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 10 Jan 2010 13:16:28 +0000
Subject: [PATCH] Made sure that the pre-cflags patches are uniform to the
 other in-tree kernel patches, i.e. that -p1 has to be used to apply these
 patches.

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1443 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 srpt/README.ofed                            | 2 +-
 srpt/patches/kernel-2.6.18-pre-cflags.patch | 4 ++--
 srpt/patches/kernel-2.6.27-pre-cflags.patch | 4 ++--
 srpt/patches/kernel-2.6.30-pre-cflags.patch | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srpt/README.ofed b/srpt/README.ofed
index 12df4e33a..c7e3171d2 100644
--- a/srpt/README.ofed
+++ b/srpt/README.ofed
@@ -63,7 +63,7 @@ the variable PRE_CFLAGS:
   else
     cd /usr/src/linux-$(uname -r)
   fi
-  patch -p0 < ${SCST_DIR}/srpt/patches/kernel-${KV}-pre-cflags.patch
+  patch -p1 < ${SCST_DIR}/srpt/patches/kernel-${KV}-pre-cflags.patch
 
 Next, download and install the OFED package. Make sure to disable
 OFED's SRP target driver (srpt=n) and to enable at least the
diff --git a/srpt/patches/kernel-2.6.18-pre-cflags.patch b/srpt/patches/kernel-2.6.18-pre-cflags.patch
index 53cf23fce..f0801cc33 100644
--- a/srpt/patches/kernel-2.6.18-pre-cflags.patch
+++ b/srpt/patches/kernel-2.6.18-pre-cflags.patch
@@ -1,5 +1,5 @@
---- scripts/Makefile.lib	2009-05-10 20:00:05.000000000 +0200
-+++ scripts/Makefile.lib	2009-05-10 20:00:25.000000000 +0200
+--- linux-2.6.18/scripts/Makefile.lib	2009-05-10 20:00:05.000000000 +0200
++++ linux-2.6.18/scripts/Makefile.lib	2009-05-10 20:00:25.000000000 +0200
 @@ -108,7 +108,7 @@
  __cpp_flags     =                          $(call flags,_cpp_flags)
  endif
diff --git a/srpt/patches/kernel-2.6.27-pre-cflags.patch b/srpt/patches/kernel-2.6.27-pre-cflags.patch
index 7181bfc6e..1e5b34ac8 100644
--- a/srpt/patches/kernel-2.6.27-pre-cflags.patch
+++ b/srpt/patches/kernel-2.6.27-pre-cflags.patch
@@ -1,5 +1,5 @@
---- scripts/Makefile.lib	2009-05-10 19:02:42.000000000 +0200
-+++ scripts/Makefile.lib	2009-05-05 19:34:57.000000000 +0200
+--- linux-2.6.27/scripts/Makefile.lib	2009-05-10 19:02:42.000000000 +0200
++++ linux-2.6.27/scripts/Makefile.lib	2009-05-05 19:34:57.000000000 +0200
 @@ -119,7 +119,7 @@
  __cpp_flags     =                          $(call flags,_cpp_flags)
  endif
diff --git a/srpt/patches/kernel-2.6.30-pre-cflags.patch b/srpt/patches/kernel-2.6.30-pre-cflags.patch
index 4c43eae82..88cc5f82d 100644
--- a/srpt/patches/kernel-2.6.30-pre-cflags.patch
+++ b/srpt/patches/kernel-2.6.30-pre-cflags.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-10-31 13:49:29.000000000 +0100
-+++ Makefile	2009-10-31 13:49:32.000000000 +0100
+--- linux-2.6.30/Makefile	2009-10-31 13:49:29.000000000 +0100
++++ linux-2.6.30/Makefile	2009-10-31 13:49:32.000000000 +0100
 @@ -342,7 +342,7 @@ AFLAGS_KERNEL	=
  
  # Use LINUXINCLUDE when you must reference the include/ directory.