[ewg] [PARCH 3/3] Allow iser to be compiled under RHEL5.4

[Moni Shoua]

build and install iser without iscsi modules.

Signed-off-by: Moni Shoua <monis at voltaire.com>

---

--- ofa_kernel.spec.orig	2010-02-21 14:52:55.000000000 +0200
+++ ofa_kernel.spec	2010-02-21 14:54:47.000000000 +0200
@@ -51,6 +51,7 @@
 %define build_srp %(if ( echo %{configure_options} | grep "with-srp-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_srpt %(if ( echo %{configure_options} | grep "with-srp-target-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_iser %(if ( echo %{configure_options} | grep "with-iser-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
+%define build_oiscsi %(if ( echo %{configure_options} | grep "with-iscsi-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_rds %(if ( echo %{configure_options} | grep "with-rds-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_cxgb3 %(if ( echo %{configure_options} | grep "with-cxgb3-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
 %define build_nes %(if ( echo %{configure_options} | grep "with-nes-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi)
@@ -485,7 +486,7 @@
 if [ -f /etc/SuSE-release ]; then
     local_fs='$local_fs'
     openiscsi=''
-    %if %{build_iser}
+    %if %{build_oiscsi}
         openiscsi='open-iscsi'
     %endif
         perl -i -ne "if (m@^#!/bin/bash@) {
@@ -512,7 +513,7 @@
 if [ -f /etc/debian_version ]; then
     local_fs='$local_fs'
     openiscsi=''
-    %if %{build_iser}
+    %if %{build_oiscsi}
         openiscsi='open-iscsi'
     %endif
         perl -i -ne "if (m@^#!/bin/bash@) {
@@ -751,6 +752,8 @@
 %endif
 %if %{build_iser}
 %{LIB_MOD_DIR_INF}/ulp/iser
+%endif
+%if %{build_oiscsi}
 %{LIB_MOD_DIR_SCSI}/iscsi_tcp.ko
 %{LIB_MOD_DIR_SCSI}/libiscsi.ko
 %{LIB_MOD_DIR_SCSI}/scsi_transport_iscsi.ko