From: Moni Shoua <monis@Voltaire.COM>
Date: Sun, 21 Feb 2010 15:38:30 +0000 (+0200)
Subject: Allow iser to be compiled under RHEL5.4
X-Git-Tag: vofed-1.5.2-rc1~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e0f716efa075d82f31f7d1fb149f64be698f3216;p=~tnikolova%2Fofed_scripts%2F.git

Allow iser to be compiled under RHEL5.4

Add kernel of RHEL5.4 to the list of supported kernels (nackport patches
were already submitted by Or Gerlitz) and break the dependency between iSER and
iSCSI. However, the script code that builds iSCSI modules and upgrades
open-iscsi userspace RPM is still there in case we need it in the future.
Patches are to the install script and build scripts and were split into three parts.

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

diff --git a/install.pl b/install.pl
index 1bae22b..346db13 100755
--- a/install.pl
+++ b/install.pl
@@ -1680,7 +1680,7 @@ sub set_availability
 
     # Iser
     # if ($kernel =~ m/2.6.9-67|2.6.9-78|2.6.16.[0-9.]*-[0-9.]*-[A-Za-z0-9.]*|el5/) {
-    if ($kernel =~ m/2.6.3[0-2]/) {
+    if ($kernel =~ m/2.6.3[0-2]|2.6.18-164/) {
             $kernel_modules_info{'iser'}{'available'} = 1;
             $packages_info{'open-iscsi-generic'}{'available'} = 1;
     }
@@ -2777,17 +2777,6 @@ sub check_open_iscsi
                 if ( $ans eq 'Y' or $ans eq 'y' ) {
                     $upgrade_open_iscsi = 1;
                 }
-                else {
-                    print RED "Please uninstall $oiscsi_name before installing $PACKAGE with iSER support.", RESET "\n";
-                    exit 1;
-                }
-            }
-            else {
-                if (not $upgrade_open_iscsi) {
-                    print RED "Please uninstall $oiscsi_name before installing $PACKAGE with iSER support.", RESET "\n";
-                    print RED "  Or put \"upgrade_open_iscsi=yes\" in the $config:", RESET "\n";
-                    exit 1;
-                }
             }
         }
     }