From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Fri, 6 Sep 2019 20:38:05 +0000 (-0500)
Subject: install.pl: Use infiniband-diags from rdma-core
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=951dc5789ea0efcd22b595f0029be07659f062a0;p=~vlad%2Fofed_scripts.git

install.pl: Use infiniband-diags from rdma-core

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

diff --git a/install.pl b/install.pl
index 1df924e..94cb802 100755
--- a/install.pl
+++ b/install.pl
@@ -613,6 +613,7 @@ my @rdma_core_packages = ("libibverbs", "libibverbs1", "libibverbs-utils",
                           "librdmacm", "librdmacm1", "librdmacm-utils",
                           "libmlx5-1", "libmlx4-1",
                           "libibumad", "libibumad3",
+                          "infiniband-diags",
                           "ibacm", "iwpmd", "srp_daemon", "rdma-ndd", "rsocket"
                          );
 
@@ -1139,21 +1140,6 @@ my %packages_info = (
             ofa_req_inst => [],
             install32 => 0, exception => 0 },
 
-        'infiniband-diags' =>
-            { name => "infiniband-diags", parent => "infiniband-diags",
-            selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-            available => 1, mode => "user", dist_req_build => ["glib2-devel", "$libudev_devel"],
-            dist_req_inst => [], ofa_req_build => ["opensm-devel", "libibmad-devel", "rdma-core"],
-            ofa_req_inst => ["libibumad", "libibmad", "opensm-libs"],
-            install32 => 0, exception => 0, configure_options => '' },
-        'infiniband-diags-debuginfo' =>
-            { name => "infiniband-diags-debuginfo", parent => "infiniband-diags",
-            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 },
-
         'compat-dapl' =>
             { name => "dapl", parent => "compat-dapl",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
@@ -2735,15 +2721,6 @@ sub install_rpm
         $cmd .= " --nodeps";
     }
 
-    if ($name =~ m/libibmad|opensm|perftest|ibutils|infiniband-diags|qperf/) {
-        $cmd .= " --nodeps";
-    }
-
-    if ($name =~ m/infiniband-diags/) {
-	    # Force infiniband-diags installation due to conflict with rdma-core
-        $cmd .= " --force";
-    }
-
     $cmd .= " $package";
 
     print "Running $cmd\n" if ($verbose);