SLFO-pool/rdma-core
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main rdma-core revision 7538637d5fa64f85e5b6135c6ebabbcb

Browse Source
This commit is contained in:
Adrian Schröter 2024-11-08 17:25:10 +01:00
parent 0478d0596f
commit 0e37d24606
8 changed files with 128 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_service
View File

@ -1,5 +1,5 @@
<services>
<service name="tar_scm" mode="disabled">
<service name="tar_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/linux-rdma/rdma-core.git</param>
<param name="package-meta">no</param>
@ -8,10 +8,10 @@
<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="versionrewrite-replacement">\1</param>
<param name="revision">8847c327b89cdf4fcd9cf411355a6ccd12e8a054</param>
<param name="revision">77128e6b6d32a1aad7c1bec9d6eb1f061b63cf39</param>
<param name="extract">suse/rdma-core.spec</param>
</service>
<service name="recompress" mode="disabled">
<service name="recompress" mode="manual">
<param name="file">*rdma-core*.tar</param>
<param name="compression">gz</param>
</service>

12
gen-pandoc.sh
View File

@ -12,16 +12,20 @@ print('%s' % (getattr(spec, \"build\"),))
CMAKE_CMD=$(echo "$BUILD_CMDS" | sed -e :a -e '/\\$/N; s/\\\n//; ta' | grep /bin/cmake | sed -e 's/-GNinja//' -e 's/$OLDPWD\/./../')
TMPDIR=$(mktemp -d)
CURDIR=$(pwd)
cd $TMPDIR
rm -Rf $OUTDIR
tar xf $TARBALL
tar xf $CURDIR/$TARBALL
cd $OUTDIR
for patch in $PATCHES; do
patch -p0 < ../$patch || exit 1
patch -p0 < $CURDIR/$patch || exit 1
done
mkdir build
cd build
eval $CMAKE_CMD || exit 1
make docs -j4 || exit 1
tar czf ../../prebuilt-pandoc.tgz pandoc-prebuilt
cd ../..
tar czf $CURDIR/prebuilt-pandoc.tgz pandoc-prebuilt
cd $CURDIR/
rm -Rf $TMPDIR

53
kernel-boot-do-not-load-module-unsupported-on-s390.patch Normal file
View File

@ -0,0 +1,53 @@
commit c5ab85be2f7e5ec20e1d135d23847c07ee45e23c
Author: Nicolas Morey <nmorey@suse.com>
Date: Wed Feb 14 14:11:53 2024 +0100
kernel-boot: do not load module unsupported on s390
Signed-off-by: Nicolas Morey <nmorey@suse.com>
diff --git kernel-boot/modules/infiniband.conf kernel-boot/modules/infiniband.conf
index 99526e156fff..7f75b85c9ceb 100644
--- kernel-boot/modules/infiniband.conf
+++ kernel-boot/modules/infiniband.conf
@@ -1,9 +1,9 @@
# These modules are loaded by the system if any InfiniBand device is installed
# InfiniBand over IP netdevice
-ib_ipoib
+#ib_ipoib
# Access to fabric management SMPs and GMPs from userspace.
-ib_umad
+#ib_umad
# SCSI Remote Protocol target support
# ib_srpt
diff --git kernel-boot/modules/opa.conf kernel-boot/modules/opa.conf
index b9bc9f1f0146..3f9e6658b1ef 100644
--- kernel-boot/modules/opa.conf
+++ kernel-boot/modules/opa.conf
@@ -1,10 +1,10 @@
# These modules are loaded by the system if any OmniPath Architecture device
# is installed
# Infiniband over IP netdevice
-ib_ipoib
+#ib_ipoib
# Access to fabric management SMPs and GMPs from userspace.
-ib_umad
+#ib_umad
# Omnipath Ethernet Virtual NIC netdevice
opa_vnic
diff --git kernel-boot/modules/rdma.conf kernel-boot/modules/rdma.conf
index 2d342dd82f7d..0ebe3b786b28 100644
--- kernel-boot/modules/rdma.conf
+++ kernel-boot/modules/rdma.conf
@@ -1,6 +1,6 @@
# These modules are loaded by the system if any RDMA devices is installed
# iSCSI over RDMA client support
-ib_iser
+#ib_iser
# iSCSI over RDMA target support
# ib_isert

BIN
prebuilt-pandoc.tgz (Stored with Git LFS)
View File

Binary file not shown.

BIN
rdma-core-49.1.0.8847c327b89c.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
rdma-core-54.0.0.77128e6b6d32.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

28
rdma-core.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Thu Oct 10 08:39:02 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
- Update to rdma-core v54.0
- No release notes available
-------------------------------------------------------------------
Mon Aug 12 09:53:54 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
- Update to rdma-core v53.0
- No release notes available
- Remove Added-suffix-libdrm-to-CMakeLists.txt-for-drm.patch
as it was merged upstream.
-------------------------------------------------------------------
Tue Jun 25 12:53:30 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
- Update to rdma-core v52.0
- No release notes available
- Add upstream patch Added-suffix-libdrm-to-CMakeLists.txt-for-drm.patch
to fix libdrm detection.
-------------------------------------------------------------------
Wed Feb 14 13:13:23 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
- Add kernel-boot-do-not-load-module-unsupported-on-s390.patch
to prevent autoload of module not supported on s390. (bsc#1219805)
-------------------------------------------------------------------
Mon Jan 22 18:41:25 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>

35
rdma-core.spec
View File

@ -30,15 +30,16 @@
%define _modprobedir /lib/modprobe.d
%endif
%define git_ver .0.8847c327b89c
%define git_ver .0.77128e6b6d32
Name: rdma-core
Version: 49.1
Version: 54.0
Release: 0
Summary: RDMA core userspace libraries and daemons
License: BSD-2-Clause OR GPL-2.0-only
Group: Productivity/Networking/Other
%define efa_so_major 1
%define hns_so_major 1
%define verbs_so_major 1
%define rdmacm_so_major 1
%define umad_so_major 3
@ -49,6 +50,7 @@ Group: Productivity/Networking/Other
%define mad_major 5
%define efa_lname libefa%{efa_so_major}
%define hns_lname libhns%{hns_so_major}
%define verbs_lname libibverbs%{verbs_so_major}
%define rdmacm_lname librdmacm%{rdmacm_so_major}
%define umad_lname libibumad%{umad_so_major}
@ -75,6 +77,7 @@ Source4: rdma-core-rpmlintrc
Source5: gen-pandoc.sh
Source6: get_build.py
Patch0: disable-rdma-interface-renaming.patch
Patch1: kernel-boot-do-not-load-module-unsupported-on-s390.patch
BuildRequires: binutils
BuildRequires: cmake >= 2.8.11
BuildRequires: gcc
@ -89,6 +92,7 @@ BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
%if %{with_pyverbs}
BuildRequires: libdrm-devel
BuildRequires: python3-Cython
BuildRequires: python3-devel
%endif
@ -167,6 +171,7 @@ Requires: %{umad_lname} = %{version}-%{release}
Requires: %{verbs_lname} = %{version}-%{release}
%if 0%{?dma_coherent}
Requires: %{efa_lname} = %{version}-%{release}
Requires: %{hns_lname} = %{version}-%{release}
Requires: %{mana_lname} = %{version}-%{release}
Requires: %{mlx4_lname} = %{version}-%{release}
Requires: %{mlx5_lname} = %{version}-%{release}
@ -208,6 +213,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Obsoletes: libcxgb4-rdmav2 < %{version}-%{release}
Obsoletes: libefa-rdmav2 < %{version}-%{release}
Obsoletes: libhfi1verbs-rdmav2 < %{version}-%{release}
Obsoletes: libhns-rdmav2 < %{version}-%{release}
Obsoletes: libipathverbs-rdmav2 < %{version}-%{release}
Obsoletes: libmana-rdmav2 < %{version}-%{release}
Obsoletes: libmlx4-rdmav2 < %{version}-%{release}
@ -217,6 +223,7 @@ Obsoletes: libocrdma-rdmav2 < %{version}-%{release}
Obsoletes: librxe-rdmav2 < %{version}-%{release}
%if 0%{?dma_coherent}
Requires: %{efa_lname} = %{version}-%{release}
Requires: %{hns_lname} = %{version}-%{release}
Requires: %{mana_lname} = %{version}-%{release}
Requires: %{mlx4_lname} = %{version}-%{release}
Requires: %{mlx5_lname} = %{version}-%{release}
@ -236,7 +243,7 @@ Device-specific plug-in ibverbs userspace drivers are included:
- libcxgb4: Chelsio T4 iWARP HCA
- libefa: Amazon Elastic Fabric Adapter
- libhfi1: Intel Omni-Path HFI
- libhns: HiSilicon Hip06 SoC
- libhns: HiSilicon Hip08+ SoC
- libipathverbs: QLogic InfiniPath HCA
- libirdma: Intel Ethernet Connection RDMA
- libmana: Microsoft Azure Network Adapter
@ -264,6 +271,13 @@ Group: System/Libraries
%description -n %efa_lname
This package contains the efa runtime library.
%package -n %hns_lname
Summary: HNS runtime library
Group: System/Libraries
%description -n %hns_lname
This package contains the hns runtime library.
%package -n %mana_lname
Summary: MANA runtime library
Group: System/Libraries
@ -424,7 +438,11 @@ easy, object-oriented access to IB verbs.
%setup -q -n %{name}-%{version}%{git_ver}
#Extract prebuilt pandoc file in the buildlib directory
(cd buildlib && tar -xf %{S:3})
%patch0
%patch -P 0
# On s390, disable autoload of unsupported modules
%ifarch s390 s390x
%patch -P 1
%endif
%build
@ -519,6 +537,9 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
%post -n %efa_lname -p /sbin/ldconfig
%postun -n %efa_lname -p /sbin/ldconfig
%post -n %hns_lname -p /sbin/ldconfig
%postun -n %hns_lname -p /sbin/ldconfig
%post -n %mana_lname -p /sbin/ldconfig
%postun -n %mana_lname -p /sbin/ldconfig
@ -679,10 +700,12 @@ done
%{_mandir}/man7/rdma_cm.*
%if 0%{?dma_coherent}
%{_mandir}/man3/efadv*
%{_mandir}/man3/hnsdv*
%{_mandir}/man3/manadv*
%{_mandir}/man3/mlx5dv*
%{_mandir}/man3/mlx4dv*
%{_mandir}/man7/efadv*
%{_mandir}/man7/hnsdv*
%{_mandir}/man7/manadv*
%{_mandir}/man7/mlx5dv*
%{_mandir}/man7/mlx4dv*
@ -711,6 +734,10 @@ done
%files -n %efa_lname
%{_libdir}/libefa*.so.*
%files -n %hns_lname
%defattr(-,root,root)
%{_libdir}/libhns*.so.*
%files -n %mana_lname
%{_libdir}/libmana*.so.*