install.pl: Enable nvme host support

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

diff --git a/install.pl b/install.pl
index ca6f237bd8b448a0c64d898ecbde32edd703b699..d64a22d7f8c529c4a9e4d4155e0448f295dbe6be 100755 (executable)
--- a/install.pl
+++ b/install.pl
@@ -538,7 +538,7 @@ my @chelsio_uwire_packages = (
 
 # List of all available packages sorted following dependencies
 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", "vmw_pvrdma");
+my @basic_kernel_modules = ("core", "mthca", "mlx4", "mlx4_en", "mlx5", "cxgb3", "cxgb4", "nes", "i40iw", "i40e", "ehca", "qib", "ocrdma", "ipoib", "nvme_host", "nvme_target", "qedr", "bnxt_re", "vmw_pvrdma");
 my @ulp_modules = ("sdp", "srp", "srpt", "rds", "qlgc_vnic", "iser", "nfsrdma", "cxgb3i", "cxgb4i");
 my @xeon_phi_kernel = ("ibscif", "ibp-server", "ibp-debug");
 
@@ -700,15 +700,12 @@ my %kernel_modules_info = (
         'bnxt_re' =>
             { name => "bnxt_re", available => 1, selected => 0,
             included_in_rpm => 0, requires => ["core", "bnxt_en"], },
-       'nvme' =>
-            { name => "nvme", available => 0, selected => 0,
+        'nvme_host' =>
+            { name => "nvme_host", available => 1, selected => 0,
+            included_in_rpm => 0, requires => ["core"], },
+        'nvme_target' =>
+            { name => "nvme_target", available => 0, selected => 0,
             included_in_rpm => 0, requires => ["core"], },
-        'nvme-host' =>
-            { name => "nvme-host", available => 0, selected => 0,
-            included_in_rpm => 0, requires => ["core", "nvme"], },
-        'nvme-target' =>
-            { name => "nvme-target", available => 0, selected => 0,
-            included_in_rpm => 0, requires => ["core", "nvme"], },
         );
 
 my %packages_info = (
@@ -1376,9 +1373,6 @@ sub set_availability
             $kernel_modules_info{'srpt'}{'available'} = 1;
             $kernel_modules_info{'i40e'}{'available'} = 1;
             $kernel_modules_info{'i40iw'}{'available'} = 1;
-            $kernel_modules_info{'nvme'}{'available'} = 1;
-            $kernel_modules_info{'nvme-host'}{'available'} = 1;
-            $kernel_modules_info{'nvme-target'}{'available'} = 1;
     }
     if ($rpm_distro =~ /rhel7u[45]|sles12sp3/) {
             $packages_info{'compat-rdma-firmware'}{'available'} = 0;
@@ -1815,11 +1809,11 @@ sub module_in_rpm
         $module = "rpcrdma";
     }
 
-    if ($module eq "nvme-host") {
+    if ($module eq "nvme_host") {
         $module = "nvme-rdma";
     }
 
-    if ($module eq "nvme-target") {
+    if ($module eq "nvme_target") {
         $module = "nvmet-rdma";
     }