[ewg] RE: [PATCH] ISER: fix compilation issues on Lustre kernels based on RHEL4.0U[4-6].

[Moshe Kazir]

We'll try to find a computer and test it.

Moshe 


____________________________________________________________
Moshe Katzir   |  +972-9971-8639 (o)   |   +972-52-860-6042  (m)
 
Voltaire - The Grid Backbone
 
 www.voltaire.com

  

-----Original Message-----
From: Vladimir Sokolovsky [mailto:vlad at dev.mellanox.co.il] 
Sent: Monday, January 21, 2008 6:08 PM
To: Moshe Kazir; Erez Zilber
Cc: OpenFabricsEWG; Nir Gal; Yair Ifergan
Subject: [PATCH] ISER: fix compilation issues on Lustre kernels based on
RHEL4.0U[4-6].

Hi Moshe,
The following patch fixes OFED-1.3 compilation issue on Lustre kernels:

ISER: fix compilation issues on Lustre kernels based on RHEL4.0U[4-6].

Signed-off-by: Vladimir Sokolovsky <vlad at mellanox.co.il>
---
diff --git a/kernel_patches/backport/2.6.9_U4/iscsi_06_scsi_addons.patch
b/kernel_patches/backport/2.6.9_U4/iscsi_06_scsi_addons.patch
index 1b5af7b..2c6d71f 100644
--- a/kernel_patches/backport/2.6.9_U4/iscsi_06_scsi_addons.patch
+++ b/kernel_patches/backport/2.6.9_U4/iscsi_06_scsi_addons.patch
@@ -69,7 +69,7 @@ index e212608..3bf2015 100644
   obj-$(CONFIG_SCSI_ISCSI_ATTRS) += scsi_transport_iscsi.o
   obj-$(CONFIG_ISCSI_TCP)        += libiscsi.o   iscsi_tcp.o
  +
-+CFLAGS_attribute_container.o =
-I$(PWD)/kernel_addons/backport/2.6.9_U4/include/src/
++CFLAGS_attribute_container.o =   $(BACKPORT_INCLUDES)/src/
  +
  +scsi_transport_iscsi-y := scsi_transport_iscsi_f.o scsi.o scsi_lib.o
init.o klist.o attribute_container.o transport_class.o
  +libiscsi-y             := libiscsi_f.o scsi_scan.o
diff --git a/kernel_patches/backport/2.6.9_U5/iscsi_06_scsi_addons.patch
b/kernel_patches/backport/2.6.9_U5/iscsi_06_scsi_addons.patch
index 1b5af7b..2c6d71f 100644
--- a/kernel_patches/backport/2.6.9_U5/iscsi_06_scsi_addons.patch
+++ b/kernel_patches/backport/2.6.9_U5/iscsi_06_scsi_addons.patch
@@ -69,7 +69,7 @@ index e212608..3bf2015 100644
   obj-$(CONFIG_SCSI_ISCSI_ATTRS) += scsi_transport_iscsi.o
   obj-$(CONFIG_ISCSI_TCP)        += libiscsi.o   iscsi_tcp.o
  +
-+CFLAGS_attribute_container.o =
-I$(PWD)/kernel_addons/backport/2.6.9_U4/include/src/
++CFLAGS_attribute_container.o =   $(BACKPORT_INCLUDES)/src/
  +
  +scsi_transport_iscsi-y := scsi_transport_iscsi_f.o scsi.o scsi_lib.o
init.o klist.o attribute_container.o transport_class.o
  +libiscsi-y             := libiscsi_f.o scsi_scan.o
diff --git a/kernel_patches/backport/2.6.9_U6/iscsi_06_scsi_addons.patch
b/kernel_patches/backport/2.6.9_U6/iscsi_06_scsi_addons.patch
index 1b5af7b..2c6d71f 100644
--- a/kernel_patches/backport/2.6.9_U6/iscsi_06_scsi_addons.patch
+++ b/kernel_patches/backport/2.6.9_U6/iscsi_06_scsi_addons.patch
@@ -69,7 +69,7 @@ index e212608..3bf2015 100644
   obj-$(CONFIG_SCSI_ISCSI_ATTRS) += scsi_transport_iscsi.o
   obj-$(CONFIG_ISCSI_TCP)        += libiscsi.o   iscsi_tcp.o
  +
-+CFLAGS_attribute_container.o =
-I$(PWD)/kernel_addons/backport/2.6.9_U4/include/src/
++CFLAGS_attribute_container.o =   $(BACKPORT_INCLUDES)/src/
  +
  +scsi_transport_iscsi-y := scsi_transport_iscsi_f.o scsi.o scsi_lib.o
init.o klist.o attribute_container.o transport_class.o
  +libiscsi-y             := libiscsi_f.o scsi_scan.o
diff --git a/ofed_scripts/makefile b/ofed_scripts/makefile index
bcc55fe..cb89d00 100644
--- a/ofed_scripts/makefile
+++ b/ofed_scripts/makefile
@@ -67,7 +67,7 @@ kernel:
  	@echo "Kernel version: $(KVERSION)"
  	@echo "Modules directory: $(DESTDIR)/$(MODULES_DIR)"
  	@echo "Kernel sources: $(KSRC)"
-	env CWD=$(CWD) \
+	env CWD=$(CWD) BACKPORT_INCLUDES=$(BACKPORT_INCLUDES) \
  		$(MAKE) -C $(KSRC) SUBDIRS="$(CWD)" \
  		V=1 $(WITH_MAKE_PARAMS) \
  		CONFIG_MEMTRACK=$(CONFIG_MEMTRACK) \