Revert "Remove tvflash support from OFED-1.4."

This reverts commit b784b713b5c07d922e4938c14b06cec7ca3e8286.

Conflicts:

	uninstall.sh

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.co.il>

diff --git a/install.pl b/install.pl
index c90994d6ff9abc2d4297b1ac68bb3377a226e542..e63f8d0f91a885c17f1476bffff0bb3574921499 100755 (executable)
--- a/install.pl
+++ b/install.pl
@@ -320,7 +320,7 @@ my @user_packages = ("libibverbs", "libibverbs-devel", "libibverbs-devel-static"
                      "opensm", "opensm-libs", "opensm-devel", "opensm-debuginfo", "opensm-static",
                      "compat-dapl", "compat-dapl-devel",
                      "dapl", "dapl-devel", "dapl-devel-static", "dapl-utils", "dapl-debuginfo",
-                     "perftest", "mstflint",
+                     "perftest", "mstflint", "tvflash",
                      "qlvnictools", "sdpnetstat", "srptools", "rds-tools",
                      "ibutils", "infiniband-diags", "qperf", "qperf-debuginfo",
                      "ofed-docs", "ofed-scripts", "tgt-generic", @mpi_packages
@@ -828,6 +828,21 @@ my %packages_info = (
             ofa_req_inst => [],
             install32 => 0, exception => 0 },
 
+        'tvflash' =>
+            { name => "tvflash", parent => "tvflash",
+            selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
+            available => 1, mode => "user", dist_req_build => ["pciutils-devel"],
+            dist_req_inst => [], ofa_req_build => [],
+            ofa_req_inst => [],
+            install32 => 0, exception => 0, configure_options => '' },
+        'tvflash-debuginfo' =>
+            { name => "tvflash-debuginfo", parent => "tvflash",
+            selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
+            available => 1, mode => "user", dist_req_build => [],
+            dist_req_inst => [], ofa_req_build => [],
+            ofa_req_inst => [],
+            install32 => 0, exception => 0 },
+
         'ibvexdmtools' =>
             { name => "ibvexdmtools", parent => "qlvnictools",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
@@ -1693,6 +1708,10 @@ sub set_availability
         $packages_info{'mpitests_openmpi_intel'}{'available'} = 1;
     }
 
+    if (is_installed('openSUSE-release')) {
+        $packages_info{'tvflash'}{'available'} = 0;
+    }
+
     # debuginfo RPM currently are not supported on SuSE
     if ($distro eq 'SuSE') {
         for my $package (@all_packages) {
@@ -2810,6 +2829,11 @@ sub build_rpm
                     $fflags     = " -g -O2";
                     $ldlibs     = " -g -O2";
                 }
+                elsif ($distro eq "redhat" and $parent eq "tvflash") {
+                    build_rpm_32($name);
+                    $packages_info{$name}{'rpm_exist'} = 1;
+                    return;
+                }
                 else {
                     $ldflags    .= " $optflags -m64 -g -O2 -L/usr/lib64";
                     $cflags     .= " $optflags -m64 -g -O2";
@@ -3274,6 +3298,11 @@ sub install_rpm
         }
     }
 
+    if ($arch eq "ppc64" and $distro eq "redhat" and $name =~ m/tvflash/) {
+        install_rpm_32($name);
+        return;
+    }
+
     my $version = $main_packages{$packages_info{$name}{'parent'}}{'version'};
     my $release = $main_packages{$packages_info{$name}{'parent'}}{'release'};
 

diff --git a/uninstall.sh b/uninstall.sh
index 9c03078d702c4fd500d02cfddbb82e43204b530d..e4e69bece136a8570c024ae0a884316fc0baaeba 100755 (executable)
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -77,7 +77,7 @@ IB_ALL_PACKAGES="$IB_ALL_PACKAGES libibmad libibmad-devel libibmad-static libibm
 IB_ALL_PACKAGES="$IB_ALL_PACKAGES librdmacm librdmacm-utils librdmacm-devel librdmacm-debuginfo librdmacm-static"
 IB_ALL_PACKAGES="$IB_ALL_PACKAGES libsdp libsdp-devel libsdp-debuginfo"
 IB_ALL_PACKAGES="$IB_ALL_PACKAGES opensm opensm-libs opensm-devel opensm-debuginfo opensm-static"
-IB_ALL_PACKAGES="$IB_ALL_PACKAGES perftest perftest-debuginfo mstflint mstflint-debuginfo"
+IB_ALL_PACKAGES="$IB_ALL_PACKAGES perftest perftest-debuginfo mstflint mstflint-debuginfo tvflash tvflash-debuginfo"
 IB_ALL_PACKAGES="$IB_ALL_PACKAGES compat-dapl compat-dapl-devel compat-dapl-devel-static compat-dapl-utils compat-dapl-debuginfo compat-dapl-static"
 IB_ALL_PACKAGES="$IB_ALL_PACKAGES compat-dapl-1.2.5 compat-dapl-devel-1.2.5 compat-dapl-devel-static-1.2.5 compat-dapl-utils-1.2.5 compat-dapl-debuginfo-1.2.5 compat-dapl-static-1.2.5"
 IB_ALL_PACKAGES="$IB_ALL_PACKAGES dapl dapl-devel dapl-devel-static dapl-utils dapl-debuginfo dapl-static"