From db1014e8a77dd73fed5374fb5b06251c0c515785 Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Mon, 18 Dec 2017 18:40:26 +0200
Subject: [PATCH] install.pl: Added compat-rdma-firmware package

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

diff --git a/install.pl b/install.pl
index 4e4284e..3f1f454 100755
--- a/install.pl
+++ b/install.pl
@@ -642,7 +642,7 @@ my @chelsio_uwire_packages = (
 			);
 
 # List of all available packages sorted following dependencies
-my @kernel_packages = ("compat-rdma", "compat-rdma-devel", "ib-bonding", "ib-bonding-debuginfo");
+my @kernel_packages = ("compat-rdma", "compat-rdma-devel", "compat-rdma-firmware", "ib-bonding", "ib-bonding-debuginfo");
 my @basic_kernel_modules = ("core", "mthca", "mlx4", "mlx4_en", "mlx5", "cxgb3", "cxgb4", "nes", "i40iw", "i40e", "ehca", "qib", "ocrdma", "ipoib", "nvme", "nvme-host", "nvme-target", "qedr", "bnxt_re");
 my @ulp_modules = ("sdp", "srp", "srpt", "rds", "qlgc_vnic", "iser", "nfsrdma", "cxgb3i", "cxgb4i");
 my @xeon_phi_kernel = ("ibscif", "ibp-server", "ibp-debug");
@@ -824,6 +824,12 @@ my %packages_info = (
             available => 1, mode => "kernel", dist_req_build => [],
             dist_req_inst => [], ofa_req_build => [],
             ofa_req_inst => ["compat-rdma"], },
+        'compat-rdma-firmware' =>
+            { name => "compat-rdma-firmware", parent => "compat-rdma",
+            selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
+            available => 1, mode => "kernel", dist_req_build => [],
+            dist_req_inst => [], ofa_req_build => [],
+            ofa_req_inst => ["compat-rdma"], },
         'ib-bonding' =>
             { name => "ib-bonding", parent => "ib-bonding",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
@@ -1457,6 +1463,9 @@ sub set_availability
             $kernel_modules_info{'nvme-host'}{'available'} = 1;
             $kernel_modules_info{'nvme-target'}{'available'} = 1;
     }
+    if ($rpm_distro =~ /rhel7u4|sles12sp3/) {
+            $packages_info{'compat-rdma-firmware'}{'available'} = 0;
+    }
     if ($rpm_distro =~ /rhel7u3|sles12sp2/) {
             $kernel_modules_info{'nfsrdma'}{'available'} = 1;
     }
@@ -1894,7 +1903,7 @@ sub module_in_rpm
 
     open(LIST, "rpm -qlp $package |") or die "Can't run 'rpm -qlp $package': $!\n";
     while (<LIST>) {
-        if (/$module[a-z_]*.ko/ or ($module =~ /firmware/ and /$module/)) {
+        if (/$module[a-z_]*.ko/) {
             print "is_module_in_rpm: $module $_\n" if ($verbose3);
             $ret = 0;
             last;
-- 
2.41.0