From 5056c8458696acb429279a3c07f12971f0b386df Mon Sep 17 00:00:00 2001 From: Dongqi Chen Date: Thu, 16 Apr 2020 15:13:20 +0800 Subject: [PATCH] Upgrade mellanox drivers to 4.7-3.2.9.0 to support CentOS 8.1 (cherry picked from commit e14efd21d02f9d2fd2290625107958a84c29f713) 2 modules are upgraded: rdma-core and libibverbs. driver sign method is updated to align with 4.18 kernel. Change-Id: I446a319d682d50f7e6f08b53b902f31309eb8ecf Story: 2007308 Task: 38805 Task: 38806 Depends-On: https://review.opendev.org/720325 Signed-off-by: Shuicheng Lin Signed-off-by: Dongqi Chen --- centos_tarball-dl.lst | 2 +- ...te-package-versioning-for-TIS-format.patch | 13 ++--- .../meta_patches/add-build-dependency.patch | 8 +-- ...-build-failures-due-to-unwanted-sgid.patch | 10 ++-- .../mellanox/libibverbs/centos/srpm_path | 2 +- ...encies-and-package-versioning-for-Ti.patch | 51 ++++++++++++------- .../mellanox/rdma-core/centos/srpm_path | 2 +- 7 files changed, 51 insertions(+), 37 deletions(-) diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst index 217136afe..2be8ec0ba 100644 --- a/centos_tarball-dl.lst +++ b/centos_tarball-dl.lst @@ -35,7 +35,7 @@ libtpms-0.6.0-4f0d59d.tar.gz#libtpms-0.6.0#https://github.com/stefanberger/libtp lldpd-0.9.0.tar.gz#lldpd-0.9.0#https://media.luffy.cx/files/lldpd/lldpd-0.9.0.tar.gz#http## lua-1fce39c6397056db645718b8f5821571d97869a4.tar.gz#lua#https://api.github.com/repos/ceph/lua/tarball/1fce39c6397056db645718b8f5821571d97869a4#https## !mariadb-10.1.28.tar.gz#mariadb-10.1.28#https://github.com/MariaDB/server/archive/mariadb-10.1.28.tar.gz#http_script##post-dl-script/mariadb.sh -!MLNX_OFED_SRC-4.5-1.0.1.0.tgz#MLNX_OFED_SRC-4.5-1.0.1.0#http://content.mellanox.com/ofed/MLNX_OFED-4.5-1.0.1.0/MLNX_OFED_SRC-4.5-1.0.1.0.tgz#http_script##post-dl-script/MLNX_OFEDqat1.7.sh +!MLNX_OFED_SRC-4.7-3.2.9.0.tgz#MLNX_OFED_SRC-4.7-3.2.9.0#http://content.mellanox.com/ofed/MLNX_OFED-4.7-3.2.9.0/MLNX_OFED_SRC-4.7-3.2.9.0.tgz#http_script##post-dl-script/MLNX_OFED.sh openvswitch-2.11.0.tar.gz#openvswitch-2.11.0#https://github.com/openvswitch/ovs/archive/v2.11.0.tar.gz#http## puppet-boolean-22b726dd78b0a60a224cc7054aebbf28e9306f62.tar.gz#puppet-boolean#https://github.com/voxpupuli/puppet-boolean/tarball/22b726dd78b0a60a224cc7054aebbf28e9306f62#http## puppet-dnsmasq-cff07e90890662972c97684a2baee964f68ff3ed.tar.gz#packstack/puppet/modules/dnsmasq/#https://github.com/procore/puppet-dnsmasq/tarball/cff07e90890662972c97684a2baee964f68ff3ed#http## diff --git a/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 67a1762b3..b16a3ec6e 100644 --- a/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,26 +1,27 @@ -From 929b465ceb0710134a562ab593c2a1e4a2ce5df7 Mon Sep 17 00:00:00 2001 +From bfa58d25ad24537cc798ad207f7e5458cf53877f Mon Sep 17 00:00:00 2001 From: eric zhang Date: Fri, 5 Jan 2018 21:05:50 -0500 -Subject: [PATCH 1/3] upversion with release num +Subject: [PATCH 2/3] upversion with release num Signed-off-by: eric zhang +Signed-off-by: Shuicheng Lin --- SPECS/libibverbs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec -index e55433c..74cb4d2 100644 +index 519e421..4faf18c 100644 --- a/SPECS/libibverbs.spec +++ b/SPECS/libibverbs.spec @@ -12,7 +12,7 @@ Name: libibverbs Version: 41mlnx1 --Release: OFED.4.5.0.1.0.45101 -+Release: OFED.4.5.0.1.0.45101%{?_tis_dist}.%{tis_patch_ver} +-Release: OFED.4.7.0.0.2.47329 ++Release: OFED.4.7.0.0.2.47329%{?_tis_dist}.%{tis_patch_ver} Summary: A library for direct userspace use of RDMA (InfiniBand/iWARP) hardware Group: System Environment/Libraries -- -1.8.3.1 +2.7.4 diff --git a/networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch b/networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch index a86bdbec5..c1223ec13 100644 --- a/networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch +++ b/networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch @@ -1,7 +1,7 @@ -From 0b4a6feba98f0e0bfc3db007463cd43a43797d45 Mon Sep 17 00:00:00 2001 +From 0c0ad51a359b9751910a3229f988ddf37bc489b0 Mon Sep 17 00:00:00 2001 From: Dahir Osman Date: Tue, 14 Jun 2016 14:55:39 -0400 -Subject: [PATCH] Add build dependency +Subject: [PATCH 1/3] Add build dependency To fix package complaining that libnl is not available --- @@ -9,7 +9,7 @@ To fix package complaining that libnl is not available 1 file changed, 1 insertion(+) diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec -index 4fc96d1..864c31c 100644 +index 9b4e0cd..519e421 100644 --- a/SPECS/libibverbs.spec +++ b/SPECS/libibverbs.spec @@ -22,6 +22,7 @@ Source: http://openfabrics.org/downloads/verbs/libibverbs-%{version}.tar.gz @@ -21,5 +21,5 @@ index 4fc96d1..864c31c 100644 BuildRequires: valgrind-devel %endif -- -1.8.3.1 +2.7.4 diff --git a/networking/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch b/networking/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch index cea162005..d572af5b9 100644 --- a/networking/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch +++ b/networking/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch @@ -1,17 +1,17 @@ -From e78c78816e4e07f7c1ba8bd415195efb0cd27563 Mon Sep 17 00:00:00 2001 +From f6393c8e666fc5e7e58a6f7dbef8e521dc9fc205 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Fri, 18 Nov 2016 13:53:47 -0500 -Subject: [PATCH 1/1] libibverbs: fix build failures due to unwanted sgid bit +Subject: [PATCH 3/3] libibverbs: fix build failures due to unwanted sgid bit --- SPECS/libibverbs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec -index b8913c6..1e7b1eb 100644 +index 4faf18c..83940de 100644 --- a/SPECS/libibverbs.spec +++ b/SPECS/libibverbs.spec -@@ -107,6 +107,7 @@ rm -rf $RPM_BUILD_ROOT +@@ -111,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT %if %{_with_valgrind} %{_libdir}/mlnx_ofed/valgrind/lib*.so %endif @@ -20,5 +20,5 @@ index b8913c6..1e7b1eb 100644 %{_mandir}/man3/* %{_mandir}/man7/* -- -1.8.3.1 +2.7.4 diff --git a/networking/mellanox/libibverbs/centos/srpm_path b/networking/mellanox/libibverbs/centos/srpm_path index 79c1f1b3c..8957a6dff 100644 --- a/networking/mellanox/libibverbs/centos/srpm_path +++ b/networking/mellanox/libibverbs/centos/srpm_path @@ -1 +1 @@ -repo:stx/downloads/libibverbs-41mlnx1-OFED.4.5.0.1.0.45101.src.rpm +repo:stx/downloads/libibverbs-41mlnx1-OFED.4.7.0.0.2.47329.src.rpm diff --git a/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch b/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch index 3272f3187..bcec81f7b 100644 --- a/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch +++ b/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch @@ -2,17 +2,20 @@ From 70c67a459f94f65e33e6eaf5ca2120dd2dc8de78 Mon Sep 17 00:00:00 2001 Message-Id: <70c67a459f94f65e33e6eaf5ca2120dd2dc8de78.1527783193.git.Jim.Somerville@windriver.com> From: eric zhang Date: Wed, 14 Mar 2018 14:56:21 -0400 -Subject: [PATCH 1/1] Add build dependencies and package versioning for TiS - format +Subject: [PATCH] Add build dependencies and package versioning for TiS format + +Force disable python3 to avoid random build failure due to go to +python3 path. Signed-off-by: eric zhang Signed-off-by: Jim Somerville +Signed-off-by: Shuicheng Lin --- - SPECS/rdma-core.spec | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) + SPECS/rdma-core.spec | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec -index 7f9cd5b..6d81a28 100644 +index 1f8af03..bd0e7a5 100644 --- a/SPECS/rdma-core.spec +++ b/SPECS/rdma-core.spec @@ -1,3 +1,9 @@ @@ -23,28 +26,38 @@ index 7f9cd5b..6d81a28 100644 +%endif + %{!?cmake: %global cmake cmake} - %{!?_udevrulesdir: %global _udevrulesdir /etc/udev/rules.d} - -@@ -8,7 +14,7 @@ + %{!?make_jobs: %global make_jobs make VERBOSE=1 %{?_smp_mflags}} + %{!?cmake_install: %global cmake_install DESTDIR=%{buildroot} make install} +@@ -15,7 +21,7 @@ Name: rdma-core - Version: 45mlnx1 --Release: 1%{?dist}.45101 -+Release: 1.45101%{?_tis_dist}.%{tis_patch_ver} + Version: 47mlnx1 +-Release: 1%{?dist}.47329 ++Release: 1.47329%{?_tis_dist}.%{tis_patch_ver} Summary: RDMA core userspace libraries and daemons Group: System Environment/Libraries -@@ -26,7 +32,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - BuildRequires: binutils - BuildRequires: gcc - BuildRequires: python -- +@@ -62,6 +68,9 @@ BuildRequires: python + %if 0%{?fedora} >= 21 + BuildRequires: perl-generators + %endif +BuildRequires: cmake +BuildRequires: libnl3-devel +BuildRequires: mlnx-ofa_kernel%{?bt_ext}-devel + + Requires: dracut, kmod, systemd # Red Hat/Fedora previously shipped redhat/ as a stand-alone - # package called 'rdma', which we're supplanting here. - Provides: rdma = %{version}-%{release} +@@ -351,10 +360,6 @@ easy, object-oriented access to IB verbs. + -DENABLE_STATIC=1 \ + %endif + %{EXTRA_CMAKE_FLAGS} \ +-%if %{defined __python3} +- -DPYTHON_EXECUTABLE:PATH=%{__python3} \ +- -DCMAKE_INSTALL_PYTHON_ARCH_LIB:PATH=%{python3_sitearch} \ +-%endif + %if %{with_pyverbs} + -DNO_PYVERBS=0 + %else -- -1.8.3.1 +2.7.4 diff --git a/networking/mellanox/rdma-core/centos/srpm_path b/networking/mellanox/rdma-core/centos/srpm_path index be3cdf818..c9068919d 100644 --- a/networking/mellanox/rdma-core/centos/srpm_path +++ b/networking/mellanox/rdma-core/centos/srpm_path @@ -1 +1 @@ -repo:stx/downloads/rdma-core-45mlnx1-1.45101.src.rpm +repo:stx/downloads/rdma-core-47mlnx1-1.47329.src.rpm