starlingx/integ
Code Issues Proposed changes

Move mellanox userspace from integ repo

Browse Source 
libibverbs and rdma-core are part of the mellanox driver
software package and to facilitate layering, shouldn't
be split across different repos.

Move them from the integ repo to the kernel repo so they
can co-reside with the kernel module portion.

Change-Id: I4c8582dadbae52b342d7178313d8b62beeb61148
Closes-Bug: 1877160
Depends-On: I41153feceef4eb26a41ff634c60dc3adaaf238b1
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
This commit is contained in:
Jim Somerville 2020-05-05 14:21:51 -04:00
parent 838bdd44b6
commit 02dd02d591
14 changed files with 0 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
centos_extra_downloads.lst
View File

@ -1,3 +0,0 @@
libibverbs-41mlnx1-OFED.4.7.0.0.2.47329.src.rpm
rdma-core-47mlnx1-1.47329.src.rpm

3
centos_iso_image.inc
View File

@ -199,9 +199,6 @@ python-keyring
grub2-tools
grub2-efi-x64-modules
# mellanox drivers
rdma-core
# python2-ruamel-yaml
python2-ruamel-yaml

2
centos_pkg_dirs
View File

@ -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

2
centos_pkg_dirs_rt
View File

@ -1,3 +1 @@
networking/mellanox/libibverbs
networking/mellanox/rdma-core
base/rt-setup

1
networking/mellanox/libibverbs/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=1

27
networking/mellanox/libibverbs/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,27 +0,0 @@
From bfa58d25ad24537cc798ad207f7e5458cf53877f Mon Sep 17 00:00:00 2001
From: eric zhang <eric.zhang@windriver.com>
Date: Fri, 5 Jan 2018 21:05:50 -0500
Subject: [PATCH 2/3] upversion with release num
Signed-off-by: eric zhang <eric.zhang@windriver.com>
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
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

3
networking/mellanox/libibverbs/centos/meta_patches/PATCH_ORDER
View File

@ -1,3 +0,0 @@
add-build-dependency.patch
0001-Update-package-versioning-for-TIS-format.patch
fix-build-failures-due-to-unwanted-sgid.patch

25
networking/mellanox/libibverbs/centos/meta_patches/add-build-dependency.patch
View File

@ -1,25 +0,0 @@
From 0c0ad51a359b9751910a3229f988ddf37bc489b0 Mon Sep 17 00:00:00 2001
From: Dahir Osman <dahir.osman@windriver.com>
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

24
networking/mellanox/libibverbs/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch
View File

@ -1,24 +0,0 @@
From f6393c8e666fc5e7e58a6f7dbef8e521dc9fc205 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
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

1
networking/mellanox/libibverbs/centos/srpm_path
View File

@ -1 +0,0 @@
repo:stx/downloads/libibverbs-41mlnx1-OFED.4.7.0.0.2.47329.src.rpm

1
networking/mellanox/rdma-core/centos/build_srpm.data
View File

@ -1 +0,0 @@
TIS_PATCH_VER=1

63
networking/mellanox/rdma-core/centos/meta_patches/0001-Add-build-dependencies-and-package-versioning-for-Ti.patch
View File

@ -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 <eric.zhang@windriver.com>
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 <eric.zhang@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
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

1
networking/mellanox/rdma-core/centos/meta_patches/PATCH_ORDER
View File

@ -1 +0,0 @@
0001-Add-build-dependencies-and-package-versioning-for-Ti.patch

1
networking/mellanox/rdma-core/centos/srpm_path
View File

@ -1 +0,0 @@
repo:stx/downloads/rdma-core-47mlnx1-1.47329.src.rpm