[ofa-general] [PATCH] IB/iser: make all fixes patches apply on full kernel source

[Michael S. Tsirkin]

Since we'll have RC6, I'd like to add the following cosmetic change:
move iscsi_scsi_makefile from kernel_patches/fixes to ofed_scripts,
and use a softlink to put in in place.

The solves the following problem: if I do "git clone" on ofed
tree without -n, and try to apply the fixes patchset,
I get a conflict on iscsi_scsi_makefile.patch simply because
the makefile that this patch attempts to create is part
of upstream kernel already.

I think this is 0-risk and carries real benefit for developers
who'll need to support OFED 1.2.

Erez, do you agree? If yes, I'll ask Tziporet to approve, too.

Signed-off-by: Michael S. Tsirkin <mst at dev.mellanox.co.il>

diff --git a/kernel_patches/fixes/iscsi_scsi_makefile.patch b/kernel_patches/fixes/iscsi_scsi_makefile.patch
deleted file mode 100644
index 9c4fd01..0000000
--- a/kernel_patches/fixes/iscsi_scsi_makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Add a Makefile based on the kernel's drivers/scsi/Makefile in order to build open-iscsi.
-
-Signed-off-by: Erez Zilber <erezz at voltaire.com>
-
-diff -ruN ofa_1_2_kernel-20061228-0200/drivers/scsi/Makefile ofa_1_2_kernel-20061228-0200-open-iscsi/drivers/scsi/Makefile
---- ofa_1_2_kernel-20061228-0200/drivers/scsi/Makefile  1970-01-01 02:00:00.000000000 +0200
-+++ ofa_1_2_kernel-20061228-0200-open-iscsi/drivers/scsi/Makefile       2006-12-28 17:01:22.000000000 +0200
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_SCSI_ISCSI_ATTRS) += scsi_transport_iscsi.o
-+obj-$(CONFIG_ISCSI_TCP)        += libiscsi.o   iscsi_tcp.o
diff --git a/ofed_scripts/iscsi_scsi_makefile b/ofed_scripts/iscsi_scsi_makefile
new file mode 100644
index 0000000..cfdf3e0
--- /dev/null
+++ b/ofed_scripts/iscsi_scsi_makefile
@@ -0,0 +1,4 @@
+# Makefile based on the kernel's drivers/scsi/Makefile
+# to build open-iscsi.
+obj-$(CONFIG_SCSI_ISCSI_ATTRS) += scsi_transport_iscsi.o
+obj-$(CONFIG_ISCSI_TCP)        += libiscsi.o   iscsi_tcp.o
diff --git a/ofed_scripts/ofed_checkout.sh b/ofed_scripts/ofed_checkout.sh
index 037b391..86fc8b8 100755
--- a/ofed_scripts/ofed_checkout.sh
+++ b/ofed_scripts/ofed_checkout.sh
@@ -43,3 +43,4 @@ ex git update-ref HEAD $1
 ln -snf ofed_scripts/configure
 ln -snf ofed_scripts/Makefile
 ln -snf ofed_scripts/makefile
+(cd drivers/scsi/; ln -snf ../../ofed_scripts/iscsi_scsi_makefile Makefile)
-- 
MST