From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Mon, 5 Mar 2018 23:13:25 +0000 (-0600)
Subject: install.pl: Ignore firmware in compat-rdma-content
X-Git-Tag: vofed-4.8-2-rc3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2Fvofed-4.8-2-rc3;p=~vlad%2Fofed_scripts.git

install.pl: Ignore firmware in compat-rdma-content

firmware is included in compat-rdma-firmware RPM, so, it should be
ignored when examing the content of compat-rdma RPM.

bug: 2677

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

diff --git a/install.pl b/install.pl
index 47ce49b..762f197 100755
--- a/install.pl
+++ b/install.pl
@@ -2006,6 +2006,14 @@ sub resolve_dependencies
 
     if ($packages_info{'compat-rdma'}{'rpm_exist'}) {
         for my $module (@selected_kernel_modules) {
+            if ($module eq "firmware") {
+                if (not $packages_info{'compat-rdma-firmware'}{'rpm_exist'}) {
+                    $packages_info{'compat-rdma'}{'rpm_exist'} = 0;
+                    last;
+                } else {
+                    next;
+                }
+            }
             if (module_in_rpm($module)) {
                 $packages_info{'compat-rdma'}{'rpm_exist'} = 0;
                 last;