install.pl: Build intel-mic-psm as needed

When xeon-phi support is enabled, the install script passes extra build
arguments for infinipath-psm, producing a new package intel-mic-psm that
should be installed in place of infinipath-psm.

Signed-off-by: Kyle Liddell <kyle.liddell@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>

diff --git a/install.pl b/install.pl
index 651cb1be62fe039ceb8ff79f78ef6c26ea620479..ae9ad633aaa09a252a8e7629eb4c6606f6cc0b6b 100755 (executable)
--- a/install.pl
+++ b/install.pl
@@ -406,6 +406,12 @@ if (not $check_linux_deps) {
     $rpmbuild_flags .= ' --nodeps';
     $rpminstall_flags .= ' --nodeps';
 }
+
+if ($with_xeon_phi) {
+    $rpmbuild_flags .= "-D 'PSM_HAVE_SCIF 1'";
+    $rpminstall_flags .= "-D 'PSM_HAVE_SCIF 1'";
+}
+
 my $optflags  = `rpm --eval '%{optflags}'`;
 chomp $optflags;
 
@@ -552,7 +558,7 @@ my @prev_ofed_packages = (
                         "openmpi", "openmpi-devel", "openmpi-libs",
                         "ibutils", "ibutils-devel", "ibutils-libs", "ibutils2", "ibutils2-devel",
                         "libnes", "libnes-devel",
-                        "infinipath-psm", "infinipath-psm-devel",
+                        "infinipath-psm", "infinipath-psm-devel", "intel-mic-psm", "intel-mic-psm-devel",
                         "ibpd", "libibscif", "libibscif-devel",
                         "mvapich", "openmpi", "mvapich2"
                         );
@@ -600,7 +606,8 @@ my @mpi_packages = ( "mpi-selector",
                      @mpitests_packages
                     );
 
-my @xeon_phi_user = ("ibpd", "libibscif");
+my @xeon_phi_user = ("ibpd", "libibscif", "intel-mic-psm", "intel-mic-psm-devel");
+my @non_xeon_phi_user = ("infinipath-psm", "infinipath-psm-devel");
 
 my @user_packages = ("libibverbs", "libibverbs-devel", "libibverbs-devel-static",
                      "libibverbs-utils", "libibverbs-debuginfo",
@@ -626,7 +633,7 @@ my @user_packages = ("libibverbs", "libibverbs-devel", "libibverbs-devel-static"
                      "qlvnictools", "sdpnetstat", "srptools", "rds-tools", "rds-devel",
                      "ibutils", "infiniband-diags", "qperf", "qperf-debuginfo",
                      "ofed-docs", "ofed-scripts",
-                     "infinipath-psm", "infinipath-psm-devel", @mpi_packages
+                    @mpi_packages
                      );
 
 my @basic_kernel_packages = ("compat-rdma");
@@ -1672,6 +1679,18 @@ my %packages_info = (
              available => 0, mode => "user", dist_req_build => [],
              dist_req_inst => [], ofa_req_build => [],
              ofa_req_inst => ["infinipath-psm"], install32 => 0, exception => 0 },
+        'intel-mic-psm' =>
+            { name => "intel--psm", parent=> "infinipath-psm",
+             selected => 0, installed => 0, rpm_exits => 0, rpm_exists32 => 0,
+             available => 0, mode => "user", dist_req_build => [],
+             dist_req_inst => [], ofa_req_build => [],
+             ofa_req_inst => [], install32 => 0, exception => 0 },
+        'intel-mic-psm-devel' =>
+            { name => "intel-mic-psm-devel", parent=> "infinipath-psm",
+             selected => 0, installed => 0, rpm_exits => 0, rpm_exists32 => 0,
+             available => 0, mode => "user", dist_req_build => [],
+             dist_req_inst => [], ofa_req_build => [],
+             ofa_req_inst => ["intel-mic-psm"], install32 => 0, exception => 0 },
         );
 
 
@@ -1940,6 +1959,8 @@ sub set_availability
     if ($arch =~ m/x86_64/) {
            $packages_info{'infinipath-psm'}{'available'} = 1;
            $packages_info{'infinipath-psm-devel'}{'available'} = 1;
+           $packages_info{'intel-mic-psm'}{'available'} = 1;
+           $packages_info{'intel-mic-psm-devel'}{'available'} = 1;
            $kernel_modules_info{'qib'}{'available'} = 1;
            $packages_info{'libipathverbs'}{'available'} = 1;
            $packages_info{'libipathverbs-devel'}{'available'} = 1;
@@ -4395,7 +4416,11 @@ sub main
         }
 
         @selected_by_user = (@list);
-        push (@selected_by_user, @xeon_phi_user) if ($with_xeon_phi);
+       if ($with_xeon_phi){
+           push (@selected_by_user, @xeon_phi_user);
+       } else { 
+           push (@selected_by_user, @non_xeon_phi_user);
+       }
 
         @selected_modules_by_user = (@kernel_modules);
         push (@selected_modules_by_user, @xeon_phi_kernel) if ($with_xeon_phi);
@@ -4436,7 +4461,11 @@ sub main
     my $num_selected = 0;
 
     push (@kernel_modules, @xeon_phi_kernel) if ($with_xeon_phi);
-    push (@all_packages, @xeon_phi_user) if ($with_xeon_phi);
+    if ($with_xeon_phi){
+       push (@all_packages, @xeon_phi_user);
+    } else { 
+       push (@all_packages, @non_xeon_phi_user);
+    }
 
     if ($interactive) {
         my $inp;