From 7a3bcce3fd25e63fc468bfd0a84bdd65f3293fb3 Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Sun, 31 May 2015 09:39:28 +0300
Subject: [PATCH] install: remove libnl3 requirement and enable libfabrics on
 all OSes

Also removes unnecessary PSM_HAVE_SCIF during install.
issue: http://bugs.openfabrics.org/bugzilla/show_bug.cgi?id=2548

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
 install.pl | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/install.pl b/install.pl
index 6fb42a5..fe6c819 100755
--- a/install.pl
+++ b/install.pl
@@ -427,7 +427,6 @@ if (not $check_linux_deps) {
 
 if ($with_xeon_phi) {
     $rpmbuild_flags .= "-D 'PSM_HAVE_SCIF 1'";
-    $rpminstall_flags .= "-D 'PSM_HAVE_SCIF 1'";
 }
 
 my $optflags  = `rpm --eval '%{optflags}'`;
@@ -477,8 +476,8 @@ if ($DISTRO eq "openSUSE11.2") {
     $libgcc = 'libgcc_s1';
     $libgfortran = 'libgfortran3';
     $curl_devel = 'libcurl-devel';
-    $libnl = "libnl3-200";
-    $libnl_devel = "libnl3-devel";
+    $libnl = "libnl1";
+    $libnl_devel = "libnl-1_1-devel";
     $libnl3 = "libnl3-200";
     $libnl3_devel = "libnl3-devel";
 } elsif ($DISTRO =~ m/RHEL|OEL|FC/) {
@@ -1026,21 +1025,21 @@ my %packages_info = (
         'libfabric' =>
             { name => "libfabric", parent => "libfabric",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-            available => 0, mode => "user", dist_req_build => ["$libnl3_devel"],
-            dist_req_inst => ["$libnl3"], ofa_req_build => ["libibverbs-devel", "librdmacm-devel", "infinipath-psm-devel"],
+            available => 1, mode => "user", dist_req_build => ["$libnl_devel"],
+            dist_req_inst => ["$libnl"], ofa_req_build => ["libibverbs-devel", "librdmacm-devel", "infinipath-psm-devel"],
             ofa_req_inst => ["libibverbs", "librdmacm", "infinipath-psm"],
             install32 => 1, exception => 0, configure_options => '' },
         'libfabric-devel' =>
             { name => "libfabric-devel", parent => "libfabric",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-            available => 0, mode => "user", dist_req_build => [],
+            available => 1, mode => "user", dist_req_build => [],
             dist_req_inst => [], ofa_req_build => ["libfabric"],
             ofa_req_inst => ["libfabric"],
             install32 => 1, exception => 0 },
         'libfabric-debuginfo' =>
             { name => "libfabric-debuginfo", parent => "libfabric",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-            available => 0, mode => "user", dist_req_build => [],
+            available => 1, mode => "user", dist_req_build => [],
             dist_req_inst => [], ofa_req_build => ["libfabric"],
             ofa_req_inst => ["libfabric"],
             install32 => 0, exception => 0 },
@@ -1048,14 +1047,14 @@ my %packages_info = (
         'fabtests' =>
             { name => "fabtests", parent => "fabtests",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-            available => 0, mode => "user", dist_req_build => [],
+            available => 1, mode => "user", dist_req_build => [],
             dist_req_inst => [], ofa_req_build => ["libfabric-devel", "libibverbs-devel", "librdmacm-devel", "infinipath-psm-devel"],
             ofa_req_inst => ["libfabric", "libibverbs", "librdmacm", "infinipath-psm"],
             install32 => 1, exception => 0, configure_options => '' },
         'fabtests-debuginfo' =>
             { name => "fabtests-debuginfo", parent => "fabtests",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
-            available => 0, mode => "user", dist_req_build => [],
+            available => 1, mode => "user", dist_req_build => [],
             dist_req_inst => [], ofa_req_build => ["fabtests"],
             ofa_req_inst => ["fabtests"],
             install32 => 0, exception => 0 },
@@ -1293,7 +1292,7 @@ my %packages_info = (
             { name => "libiwpm", parent => "libiwpm",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user", dist_req_build => ["$libnl_devel"],
-            dist_req_inst => [], ofa_req_build => [],
+            dist_req_inst => ["$libnl"], ofa_req_build => [],
             ofa_req_inst => [],
             install32 => 0, exception => 0, configure_options => '' },
 
@@ -2094,12 +2093,6 @@ sub set_availability
         $packages_info{'mpitests_openmpi_intel'}{'available'} = 1;
     }
 
-    if ($DISTRO =~ m/RHEL6.6|SLES12/ or is_installed("$libnl3_devel")) {
-        $packages_info{'libfabric'}{'available'} = 1;
-        $packages_info{'libfabric-devel'}{'available'} = 1;
-        $packages_info{'libfabric-debuginfo'}{'available'} = 1;
-    }
-
     # debuginfo RPM currently are not supported on SuSE
     if ($DISTRO =~ m/SLES/ or $DISTRO eq 'DEBIAN') {
         for my $package (@all_packages) {
-- 
2.41.0