]> git.openfabrics.org - ~vlad/ofed_scripts.git/commitdiff
install.pl: Updated rdma-core requirements vofed-4.17-1 vofed-4.17-1-rc1 vofed-4.17-1-rc2
authorVladimir Sokolovsky <vlad@mellanox.com>
Mon, 8 Apr 2019 20:26:32 +0000 (15:26 -0500)
committerVladimir Sokolovsky <vlad@mellanox.com>
Mon, 8 Apr 2019 20:26:32 +0000 (15:26 -0500)
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
install.pl

index 99fde69a98a38f83c3c33b933d3a67b96fb3b659..418974403ca3237e8322a25255164af27a9e5f0a 100755 (executable)
@@ -124,7 +124,9 @@ my $force = 0;
 my $kmp = 1;
 my $with_xeon_phi = 0;
 my $libnl = "libnl3";
+my $libnl3 = 'libnl3';
 my $libnl_devel = "libnl3-devel";
+my $libnl3_devel = 'libnl3-devel';
 my %disabled_packages;
 
 while ( $#ARGV >= 0 ) {
@@ -415,6 +417,10 @@ if ($DISTRO =~ m/SLES11/) {
     $libstdc = 'libstdc++';
 }
 
+if ($DISTRO =~ /(SLES|openSUSE)1[25] | openSUSE_TUMBLEWEED/x) {
+    $libnl3 = 'libnl3-200';
+}
+
 my $insserv_compat = "";
 my $libstdc_devel = "$libstdc-devel";
 if ($DISTRO =~ m/SLES12/) {
@@ -430,6 +436,8 @@ push (@rdma_core_build_deps, "$cmake");
 push (@rdma_core_build_deps, "$ninja");
 push (@rdma_core_build_deps, "$pkgconfig");
 
+my $valgrind_devel = "valgrind-devel";
+
 # Suffix for 32 and 64 bit packages
 my $is_suse_suff64 = $arch eq "ppc64" && $DISTRO !~ /SLES11|SLES12/;
 my $suffix_32bit = ($DISTRO =~ m/SLES|openSUSE/ && !$is_suse_suff64) ? "-32bit" : ".$target_cpu32";
@@ -764,9 +772,26 @@ my %packages_info = (
             { name => "rdma-core", parent => "rdma-core",
             selected => 0, installed => 0, rpm_exist => 0, rpm_exist32 => 0,
             available => 1, mode => "user",
-            dist_req_build =>
-            ($build32 == 1 )?[@rdma_core_build_deps, "$gcc", "$glibc_devel$suffix_64bit","$glibc_devel$suffix_32bit","$libgcc","$libgcc"."$suffix_32bit", "$libnl_devel"."$suffix_64bit", ($DISTRO =~ /SUSE/)?"$libnl_devel"."$suffix_32bit":(($arch =~ /ppc/)?"$libnl_devel":"$libnl_devel.$target_cpu32")]:[@rdma_core_build_deps, "$gcc","$glibc_devel$suffix_64bit","$libgcc", "$libnl_devel"."$suffix_64bit"],
-            dist_req_inst => ( $build32 == 1 )?["$pkgconfig","$libnl"."$suffix_64bit", ($dist_rpm !~ /sles-release-11.1/)?"$libnl"."$suffix_32bit":"$libnl.$target_cpu32"]:["$pkgconfig","$libnl"."$suffix_64bit"] ,
+            dist_req_build => [
+                "cmake__2.8.11", "$libudev_devel", "$pkgconfig",
+                "$valgrind_devel", "$gcc", "$glibc_devel$suffix_64bit",
+                "$libgcc",
+                "$libnl3_devel"."$suffix_64bit",
+                ($build32 == 1) ? (
+                    "$glibc_devel$suffix_32bit",
+                    "$libgcc" . (($DISTRO eq "SLES10") ? ".$target_cpu32" : "$suffix_32bit"),
+                    ($DISTRO =~ /SUSE/) ? "$libnl3_devel"."$suffix_32bit" : (
+                        ($arch =~ /ppc/) ? "$libnl3_devel" : "$libnl3_devel.$target_cpu32"
+                    )
+                ) : ()
+            ],
+            dist_req_inst => [
+                "$pkgconfig", "$libudev", "$libnl3"."$suffix_64bit",
+                ($build32 == 1) ? (
+                    ($dist_rpm !~ /sles-release-11.1/)?"$libnl"."$suffix_32bit" :
+                        "$libnl.$target_cpu32"
+                ) : ()
+            ] ,
             ofa_req_build => [],
             ofa_req_inst => ["ofed-scripts"],
             install32 => 1, exception => 0 },