diff --git a/centos_extra_downloads.lst b/centos_extra_downloads.lst index 72b91415a..e69de29bb 100644 --- a/centos_extra_downloads.lst +++ b/centos_extra_downloads.lst @@ -1,3 +0,0 @@ -libibverbs-41mlnx1-OFED.4.7.0.0.2.47329.src.rpm -rdma-core-47mlnx1-1.47329.src.rpm - diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 289c64292..64c90b08f 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -199,9 +199,6 @@ python-keyring grub2-tools grub2-efi-x64-modules -# mellanox drivers -rdma-core - # python2-ruamel-yaml python2-ruamel-yaml diff --git a/centos_pkg_dirs b/centos_pkg_dirs index a7b29e49e..1666bd4a2 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -52,8 +52,6 @@ storage-drivers/python-3parclient storage-drivers/python-lefthandclient storage-drivers/trident-installer security/tboot -networking/mellanox/libibverbs -networking/mellanox/rdma-core docker/python-docker kubernetes/containerd kubernetes/kubernetes diff --git a/centos_pkg_dirs_rt b/centos_pkg_dirs_rt index 615dfc090..948e231bb 100644 --- a/centos_pkg_dirs_rt +++ b/centos_pkg_dirs_rt @@ -1,3 +1 @@ -networking/mellanox/libibverbs -networking/mellanox/rdma-core base/rt-setup diff --git a/networking/mellanox/libibverbs/centos/build_srpm.data b/networking/mellanox/libibverbs/centos/build_srpm.data deleted file mode 100644 index 8aeb55368..000000000 --- a/networking/mellanox/libibverbs/centos/build_srpm.data +++ /dev/null @@ -1 +0,0 @@ -TIS_PATCH_VER=1 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 deleted file mode 100644 index b16a3ec6e..000000000 --- a/networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bfa58d25ad24537cc798ad207f7e5458cf53877f Mon Sep 17 00:00:00 2001 -From: eric zhang -Date: Fri, 5 Jan 2018 21:05:50 -0500 -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 519e421..4faf18c 100644 ---- a/SPECS/libibverbs.spec -+++ b/SPECS/libibverbs.spec -@@ -12,7 +12,7 @@ - - Name: libibverbs - Version: 41mlnx1 --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 --- -2.7.4 - diff --git a/networking/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER b/networking/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index a46a12472..000000000 --- a/networking/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1,3 +0,0 @@ -add-build-dependency.patch -0001-Update-package-versioning-for-TIS-format.patch -fix-build-failures-due-to-unwanted-sgid.patch diff --git a/networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch b/networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch deleted file mode 100644 index c1223ec13..000000000 --- a/networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0c0ad51a359b9751910a3229f988ddf37bc489b0 Mon Sep 17 00:00:00 2001 -From: Dahir Osman -Date: Tue, 14 Jun 2016 14:55:39 -0400 -Subject: [PATCH 1/3] Add build dependency - -To fix package complaining that libnl is not available ---- - SPECS/libibverbs.spec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SPECS/libibverbs.spec b/SPECS/libibverbs.spec -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 - BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - Requires(post): /sbin/ldconfig - Requires(postun): /sbin/ldconfig -+BuildRequires: libnl-devel - %if %{_with_valgrind} - BuildRequires: valgrind-devel - %endif --- -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 deleted file mode 100644 index d572af5b9..000000000 --- a/networking/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f6393c8e666fc5e7e58a6f7dbef8e521dc9fc205 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Fri, 18 Nov 2016 13:53:47 -0500 -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 4faf18c..83940de 100644 ---- a/SPECS/libibverbs.spec -+++ b/SPECS/libibverbs.spec -@@ -111,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT - %if %{_with_valgrind} - %{_libdir}/mlnx_ofed/valgrind/lib*.so - %endif -+%dir %attr(0755,root,root) %{_includedir}/infiniband - %{_includedir}/* - %{_mandir}/man3/* - %{_mandir}/man7/* --- -2.7.4 - diff --git a/networking/mellanox/libibverbs/centos/srpm_path b/networking/mellanox/libibverbs/centos/srpm_path deleted file mode 100644 index 8957a6dff..000000000 --- a/networking/mellanox/libibverbs/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -repo:stx/downloads/libibverbs-41mlnx1-OFED.4.7.0.0.2.47329.src.rpm diff --git a/networking/mellanox/rdma-core/centos/build_srpm.data b/networking/mellanox/rdma-core/centos/build_srpm.data deleted file mode 100644 index 8aeb55368..000000000 --- a/networking/mellanox/rdma-core/centos/build_srpm.data +++ /dev/null @@ -1 +0,0 @@ -TIS_PATCH_VER=1 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 deleted file mode 100644 index bcec81f7b..000000000 --- a/networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch +++ /dev/null @@ -1,63 +0,0 @@ -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] 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 | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec -index 1f8af03..bd0e7a5 100644 ---- a/SPECS/rdma-core.spec -+++ b/SPECS/rdma-core.spec -@@ -1,3 +1,9 @@ -+%if "%{_tis_build_type}" == "rt" -+%define bt_ext -rt -+%else -+%undefine bt_ext -+%endif -+ - %{!?cmake: %global cmake cmake} - %{!?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: 47mlnx1 --Release: 1%{?dist}.47329 -+Release: 1.47329%{?_tis_dist}.%{tis_patch_ver} - Summary: RDMA core userspace libraries and daemons - Group: System Environment/Libraries - -@@ -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 -@@ -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 --- -2.7.4 - diff --git a/networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER b/networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index 1b04e9d9b..000000000 --- a/networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1 +0,0 @@ -0001-Add-build-dependencies-and-package-versioning-for-Ti.patch diff --git a/networking/mellanox/rdma-core/centos/srpm_path b/networking/mellanox/rdma-core/centos/srpm_path deleted file mode 100644 index c9068919d..000000000 --- a/networking/mellanox/rdma-core/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -repo:stx/downloads/rdma-core-47mlnx1-1.47329.src.rpm