Fix dependencies issues.

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

diff --git a/install.pl b/install.pl
index 57219d8c6b0875ee924e7bbdaf1b6c3b8b561d8b..ee61e2a2839db20d85ae19b49284348bd372adb2 100755 (executable)
--- a/install.pl
+++ b/install.pl
@@ -487,14 +487,14 @@ my %packages_info = (
             { name => "libibcm", parent => "libibcm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => ["libibverbs"],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
             ofa_req_inst => ["libibverbs"],
             install32 => 1, exception => 0, configure_options => '' },
         'libibcm-devel' =>
             { name => "libibcm-devel", parent => "libibcm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => ["libibverbs","libibverbs-devel"],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
             ofa_req_inst => ["libibverbs", "libibverbs-devel", "libibcm"],
             install32 => 1, exception => 0 },
         'libibcm-debuginfo' =>
@@ -531,21 +531,21 @@ my %packages_info = (
             { name => "libibumad", parent => "libibumad",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => ["libibverbs"],
+            dist_req_inst => [], ofa_req_build => ["libibverbs", "libibcommon-devel"],
             ofa_req_inst => ["libibverbs", "libibcommon"],
             install32 => 1, exception => 0, configure_options => '' },
         'libibumad-devel' =>
             { name => "libibumad-devel", parent => "libibumad",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => ["libibverbs","libibverbs-devel"],
+            dist_req_inst => [], ofa_req_build => ["libibverbs","libibcommon-devel"],
             ofa_req_inst => ["libibverbs", "libibcommon-devel", "libibumad"],
             install32 => 1, exception => 0 },
         'libibumad-debuginfo' =>
             { name => "libibumad-debuginfo", parent => "libibumad",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => ["libibverbs","libibverbs-devel"],
+            dist_req_inst => [], ofa_req_build => ["libibverbs","libibcommon-devel"],
             ofa_req_inst => [],
             install32 => 0, exception => 0 },
 
@@ -567,7 +567,7 @@ my %packages_info = (
             { name => "libibmad-debuginfo", parent => "libibmad",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel"],
             ofa_req_inst => [],
             install32 => 0, exception => 0 },
 
@@ -575,35 +575,35 @@ my %packages_info = (
             { name => "opensm", parent => "opensm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel"],
             ofa_req_inst => ["opensm-libs"],
             install32 => 0, exception => 0, configure_options => '' },
         'opensm-devel' =>
             { name => "opensm-devel", parent => "opensm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel"],
             ofa_req_inst => ["libibumad-devel", "opensm-libs"],
             install32 => 1, exception => 0 },
         'opensm-libs' =>
             { name => "opensm-libs", parent => "opensm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel"],
             ofa_req_inst => ["libibumad"],
             install32 => 1, exception => 0 },
         'opensm-static' =>
             { name => "opensm-static", parent => "opensm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel"],
             ofa_req_inst => ["libibumad-devel", "opensm-libs"],
             install32 => 1, exception => 0 },
         'opensm-debuginfo' =>
             { name => "opensm-debuginfo", parent => "opensm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel"],
             ofa_req_inst => [],
             install32 => 0, exception => 0 },
 
@@ -611,28 +611,28 @@ my %packages_info = (
             { name => "librdmacm", parent => "librdmacm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
             ofa_req_inst => ["libibverbs", "libibverbs-devel"],
             install32 => 1, exception => 0, configure_options => '' },
         'librdmacm-devel' =>
             { name => "librdmacm-devel", parent => "librdmacm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
             ofa_req_inst => ["librdmacm"],
             install32 => 1, exception => 0 },
         'librdmacm-utils' =>
             { name => "librdmacm-utils", parent => "librdmacm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
             ofa_req_inst => ["librdmacm"],
             install32 => 0, exception => 0 },
         'librdmacm-debuginfo' =>
             { name => "librdmacm-debuginfo", parent => "librdmacm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
             ofa_req_inst => [],
             install32 => 0, exception => 0 },
 
@@ -744,14 +744,14 @@ my %packages_info = (
             { name => "srptools", parent => "srptools",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibcommon-devel", "libibumad-devel"],
             ofa_req_inst => ["libibcommon", "libibumad", "libibverbs"],
             install32 => 0, exception => 0, configure_options => '' },
         'srptools-debuginfo' =>
             { name => "srptools-debuginfo", parent => "srptools",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibcommon-devel", "libibumad-devel"],
             ofa_req_inst => [],
             install32 => 0, exception => 0 },
 
@@ -789,7 +789,7 @@ my %packages_info = (
             { name => "infiniband-diags", 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 => ["opensm-devel"],
+            dist_req_inst => [], ofa_req_build => ["opensm-devel", "libibcommon-devel", "libibmad-devel", "libibumad-devel"],
             ofa_req_inst => ["libibcommon", "libibumad", "libibmad", "opensm-libs"],
             install32 => 0, exception => 0, configure_options => '' },
         'infiniband-diags-debuginfo' =>
@@ -812,35 +812,35 @@ my %packages_info = (
             { name => "mvapich", parent => "mvapich",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => ["libstdc++-devel"],
-            dist_req_inst => ["libstdc++"], ofa_req_build => [],
-            ofa_req_inst => [],
+            dist_req_inst => ["libstdc++"], ofa_req_build => ["libibumad-devel"],
+            ofa_req_inst => ["libibumad"],
             install32 => 0, exception => 0, configure_options => '' },
         'mvapich_gcc' =>
             { name => "mvapich_gcc", parent => "mvapich",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel", "libibverbs-devel"],
             ofa_req_inst => ["mpi-selector", "libibverbs", "libibcommon", "libibumad"],
             install32 => 0, exception => 0 },
         'mvapich_pgi' =>
             { name => "mvapich_pgi", parent => "mvapich",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel", "libibverbs-devel"],
             ofa_req_inst => ["mpi-selector", "libibverbs", "libibcommon", "libibumad"],
             install32 => 0, exception => 0 },
         'mvapich_intel' =>
             { name => "mvapich_intel", parent => "mvapich",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel", "libibverbs-devel"],
             ofa_req_inst => ["mpi-selector", "libibverbs", "libibcommon", "libibumad"],
             install32 => 0, exception => 0 },
         'mvapich_pathscale' =>
             { name => "mvapich_pathscale", parent => "mvapich",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel", "libibverbs-devel"],
             ofa_req_inst => ["mpi-selector", "libibverbs", "libibcommon", "libibumad"],
             install32 => 0, exception => 0 },
 
@@ -848,35 +848,35 @@ my %packages_info = (
             { name => "mvapich2", parent => "mvapich2",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [$sysfsutils, $sysfsutils_devel, "libstdc++-devel"],
-            dist_req_inst => ["libstdc++"], ofa_req_build => [],
+            dist_req_inst => ["libstdc++"], ofa_req_build => ["libibumad-devel", "libibverbs-devel"],
             ofa_req_inst => [],
             install32 => 0, exception => 0, configure_options => '' },
         'mvapich2_gcc' =>
             { name => "mvapich2_gcc", parent => "mvapich2",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel", "libibverbs-devel", "librdmacm-devel"],
             ofa_req_inst => ["mpi-selector", "librdmacm", "libibumad"],
             install32 => 0, exception => 0 },
         'mvapich2_pgi' =>
             { name => "mvapich2_pgi", parent => "mvapich2",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel", "libibverbs-devel", "librdmacm-devel"],
             ofa_req_inst => ["mpi-selector", "librdmacm", "libibumad"],
             install32 => 0, exception => 0 },
         'mvapich2_intel' =>
             { name => "mvapich2_intel", parent => "mvapich2",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel", "libibverbs-devel", "librdmacm-devel"],
             ofa_req_inst => ["mpi-selector", "librdmacm", "libibumad"],
             install32 => 0, exception => 0 },
         'mvapich2_pathscale' =>
             { name => "mvapich2_pathscale", parent => "mvapich2",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => [], ofa_req_build => ["libibumad-devel", "libibverbs-devel", "librdmacm-devel"],
             ofa_req_inst => ["mpi-selector", "librdmacm", "libibumad"],
             install32 => 0, exception => 0 },
 
@@ -884,36 +884,36 @@ my %packages_info = (
             { name => "openmpi", parent => "openmpi",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [$sysfsutils, $sysfsutils_devel, "libstdc++-devel"],
-            dist_req_inst => ["libstdc++"], ofa_req_build => [],
-            ofa_req_inst => [],
+            dist_req_inst => ["libstdc++"], ofa_req_build => ["libibverbs-devel"],
+            ofa_req_inst => ["libibverbs", "mpi-selector"],
             install32 => 0, exception => 0, configure_options => '' },
         'openmpi_gcc' =>
             { name => "openmpi_gcc", parent => "openmpi",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
-            ofa_req_inst => ["mpi-selector"],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
+            ofa_req_inst => ["libibverbs", "mpi-selector"],
             install32 => 0, exception => 0 },
         'openmpi_pgi' =>
             { name => "openmpi_pgi", parent => "openmpi",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
-            ofa_req_inst => ["mpi-selector"],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
+            ofa_req_inst => ["libibverbs", "mpi-selector"],
             install32 => 0, exception => 0 },
         'openmpi_intel' =>
             { name => "openmpi_intel", parent => "openmpi",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
-            ofa_req_inst => ["mpi-selector"],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
+            ofa_req_inst => ["libibverbs", "mpi-selector"],
             install32 => 0, exception => 0 },
         'openmpi_pathscale' =>
             { name => "openmpi_pathscale", parent => "openmpi",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 0, mode => "user", dist_req_build => [],
-            dist_req_inst => [], ofa_req_build => [],
-            ofa_req_inst => ["mpi-selector"],
+            dist_req_inst => [], ofa_req_build => ["libibverbs-devel"],
+            ofa_req_inst => ["libibverbs", "mpi-selector"],
             install32 => 0, exception => 0 },
 
         'mpitests' =>