Compare commits
No commits in common. "imports/c8s/rdma-core-35.0-1.el8" and "c8" have entirely different histories.
imports/c8
...
c8
|
@ -1,2 +1,2 @@
|
|||
SOURCES/rdma-core-35.0.tar.gz
|
||||
SOURCES/rdma-core-46.0.tar.gz
|
||||
SOURCES/rxe_cfg.8.gz
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
de4b0a7d11ba10b4d35687a6dce8d3d6a60df342 SOURCES/rdma-core-35.0.tar.gz
|
||||
9f8871d8f64fbc64002ca64f2b714e38f1623eec SOURCES/rdma-core-46.0.tar.gz
|
||||
9187638355d9bee854989bbfc6c2956301fd52aa SOURCES/rxe_cfg.8.gz
|
||||
|
|
|
@ -1,71 +0,0 @@
|
|||
From 23408827f9f74062a43041154a78505bc9fa4ed8 Mon Sep 17 00:00:00 2001
|
||||
From: Honggang Li <honli@redhat.com>
|
||||
Date: Tue, 3 Nov 2020 20:21:33 +0800
|
||||
Subject: [PATCH] Only load i40iw for i40e device with specific PCI IDs
|
||||
|
||||
This a redhat specific hack to handle i40iw huge memory consuming issue.
|
||||
|
||||
rdma-core upstream maintainer believes this issue should be handled in
|
||||
kernel space with i40e/i40iw driver. Unfortunately, Intel does not care
|
||||
about this request.
|
||||
|
||||
<snip>
|
||||
Just for the record, why is it a bad idea to use the original udev
|
||||
rule that contained "kmod load i40iw". Two reasons:
|
||||
a) for most i40e NICs i40iw is irrelevant and we have the memory issue
|
||||
that Intel won't fix.
|
||||
b) if i40iw is loaded you can no longer unload i40e by itself.
|
||||
$ modprobe i40iw
|
||||
$ modprobe -r i40e
|
||||
modprobe: FATAL: Module i40e is in use.
|
||||
|
||||
Bad user experience and we may break existing user scripts!
|
||||
Even worse unloading i40iw unloads i40e implicitly.
|
||||
Also i40iw is going away upstream at some point.
|
||||
<snip>
|
||||
|
||||
Resolves: bz1850462
|
||||
|
||||
Signed-off-by: Honggang Li <honli@redhat.com>
|
||||
---
|
||||
kernel-boot/rdma-hw-modules.rules | 20 +++++++++++++++++++-
|
||||
1 file changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kernel-boot/rdma-hw-modules.rules b/kernel-boot/rdma-hw-modules.rules
|
||||
index 95eaf7206702..541516eb98f4 100644
|
||||
--- a/kernel-boot/rdma-hw-modules.rules
|
||||
+++ b/kernel-boot/rdma-hw-modules.rules
|
||||
@@ -11,11 +11,29 @@ ENV{ID_NET_DRIVER}=="be2net", RUN{builtin}+="kmod load ocrdma"
|
||||
ENV{ID_NET_DRIVER}=="bnxt_en", RUN{builtin}+="kmod load bnxt_re"
|
||||
ENV{ID_NET_DRIVER}=="cxgb4", RUN{builtin}+="kmod load iw_cxgb4"
|
||||
ENV{ID_NET_DRIVER}=="hns", RUN{builtin}+="kmod load hns_roce"
|
||||
-ENV{ID_NET_DRIVER}=="i40e", RUN{builtin}+="kmod load i40iw"
|
||||
ENV{ID_NET_DRIVER}=="mlx4_en", RUN{builtin}+="kmod load mlx4_ib"
|
||||
ENV{ID_NET_DRIVER}=="mlx5_core", RUN{builtin}+="kmod load mlx5_ib"
|
||||
ENV{ID_NET_DRIVER}=="qede", RUN{builtin}+="kmod load qedr"
|
||||
|
||||
+# Because most of X722 don't support RDMA, only load i40iw for X722 with specific device IDs.
|
||||
+#define I40E_INTEL_VENDOR_ID 0x8086
|
||||
+#define I40E_DEV_ID_X722 0x37CC
|
||||
+#define I40E_DEV_ID_KX_X722 0x37CE
|
||||
+#define I40E_DEV_ID_QSFP_X722 0x37CF
|
||||
+#define I40E_DEV_ID_SFP_X722 0x37D0
|
||||
+#define I40E_DEV_ID_1G_BASE_T_X722 0x37D1
|
||||
+#define I40E_DEV_ID_10G_BASE_T_X722 0x37D2
|
||||
+#define I40E_DEV_ID_SFP_I_X722 0x37D3
|
||||
+#define I40E_DEV_ID_X722_VF 0x37CD
|
||||
+ENV{ID_NET_DRIVER}=="i40e", ENV{ID_VENDOR_ID}=="0x8086", ENV{ID_MODEL_ID}=="0x37cc", RUN{builtin}+="kmod load i40iw"
|
||||
+ENV{ID_NET_DRIVER}=="i40e", ENV{ID_VENDOR_ID}=="0x8086", ENV{ID_MODEL_ID}=="0x37ce", RUN{builtin}+="kmod load i40iw"
|
||||
+ENV{ID_NET_DRIVER}=="i40e", ENV{ID_VENDOR_ID}=="0x8086", ENV{ID_MODEL_ID}=="0x37cf", RUN{builtin}+="kmod load i40iw"
|
||||
+ENV{ID_NET_DRIVER}=="i40e", ENV{ID_VENDOR_ID}=="0x8086", ENV{ID_MODEL_ID}=="0x37d0", RUN{builtin}+="kmod load i40iw"
|
||||
+ENV{ID_NET_DRIVER}=="i40e", ENV{ID_VENDOR_ID}=="0x8086", ENV{ID_MODEL_ID}=="0x37d1", RUN{builtin}+="kmod load i40iw"
|
||||
+ENV{ID_NET_DRIVER}=="i40e", ENV{ID_VENDOR_ID}=="0x8086", ENV{ID_MODEL_ID}=="0x37d2", RUN{builtin}+="kmod load i40iw"
|
||||
+ENV{ID_NET_DRIVER}=="i40e", ENV{ID_VENDOR_ID}=="0x8086", ENV{ID_MODEL_ID}=="0x37d3", RUN{builtin}+="kmod load i40iw"
|
||||
+ENV{ID_NET_DRIVER}=="i40e", ENV{ID_VENDOR_ID}=="0x8086", ENV{ID_MODEL_ID}=="0x37cd", RUN{builtin}+="kmod load i40iw"
|
||||
+
|
||||
# The user must explicitly load these modules via /etc/modules-load.d/ or otherwise
|
||||
# rxe
|
||||
|
||||
--
|
||||
2.25.4
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
From 30f781482122db14f7bf89cb31db1c6aba30bba8 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Schmidt <mschmidt@redhat.com>
|
||||
Date: Wed, 8 Feb 2023 15:19:17 +0100
|
||||
Subject: [PATCH 2/2] systemd: drop Protect* options not supported in RHEL 8
|
||||
systemd
|
||||
|
||||
Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
|
||||
---
|
||||
ibacm/ibacm.service.in | 2 --
|
||||
iwpmd/iwpmd.service.in | 2 --
|
||||
rdma-ndd/rdma-ndd.service.in | 1 -
|
||||
3 files changed, 5 deletions(-)
|
||||
|
||||
diff --git a/ibacm/ibacm.service.in b/ibacm/ibacm.service.in
|
||||
index 56538beb2b15..535e1aeae326 100644
|
||||
--- a/ibacm/ibacm.service.in
|
||||
+++ b/ibacm/ibacm.service.in
|
||||
@@ -19,8 +19,6 @@ Type=notify
|
||||
ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/ibacm --systemd
|
||||
ProtectSystem=full
|
||||
ProtectHome=true
|
||||
-ProtectHostname=true
|
||||
-ProtectKernelLogs=true
|
||||
|
||||
[Install]
|
||||
Also=ibacm.socket
|
||||
diff --git a/iwpmd/iwpmd.service.in b/iwpmd/iwpmd.service.in
|
||||
index 47afebd8ad02..dd4dc750c26c 100644
|
||||
--- a/iwpmd/iwpmd.service.in
|
||||
+++ b/iwpmd/iwpmd.service.in
|
||||
@@ -26,7 +26,5 @@ ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/iwpmd --systemd
|
||||
LimitNOFILE=102400
|
||||
ProtectSystem=full
|
||||
ProtectHome=true
|
||||
-ProtectHostname=true
|
||||
-ProtectKernelLogs=true
|
||||
|
||||
# iwpmd is automatically wanted by udev when an iWarp RDMA device is present
|
||||
diff --git a/rdma-ndd/rdma-ndd.service.in b/rdma-ndd/rdma-ndd.service.in
|
||||
index 368deec00b2c..9cbe93fb6900 100644
|
||||
--- a/rdma-ndd/rdma-ndd.service.in
|
||||
+++ b/rdma-ndd/rdma-ndd.service.in
|
||||
@@ -22,6 +22,5 @@ Restart=always
|
||||
ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/rdma-ndd --systemd
|
||||
ProtectSystem=full
|
||||
ProtectHome=true
|
||||
-ProtectKernelLogs=true
|
||||
|
||||
# rdma-ndd is automatically wanted by udev when an RDMA device with a node description is present
|
||||
--
|
||||
2.39.1
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
From 214c673b2a66a0ceb86a21ddb8cd7beba86cc6f3 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Schmidt <mschmidt@redhat.com>
|
||||
Date: Wed, 1 Feb 2023 15:24:23 +0100
|
||||
Subject: [PATCH] CMakeLists: disable providers that were not enabled in RHEL
|
||||
9.1
|
||||
|
||||
Doing a package rebase, but don't want to enable additional drivers
|
||||
unless explicitly requested.
|
||||
|
||||
Upstream Status: RHEL only
|
||||
|
||||
Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
|
||||
---
|
||||
CMakeLists.txt | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9b7462861012..cfe79bcfacf3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -711,7 +711,7 @@ add_subdirectory(providers/bnxt_re)
|
||||
add_subdirectory(providers/cxgb4) # NO SPARSE
|
||||
add_subdirectory(providers/efa)
|
||||
add_subdirectory(providers/efa/man)
|
||||
-add_subdirectory(providers/erdma)
|
||||
+#add_subdirectory(providers/erdma)
|
||||
add_subdirectory(providers/hns)
|
||||
add_subdirectory(providers/irdma)
|
||||
add_subdirectory(providers/mana)
|
||||
@@ -720,14 +720,14 @@ add_subdirectory(providers/mlx4)
|
||||
add_subdirectory(providers/mlx4/man)
|
||||
add_subdirectory(providers/mlx5)
|
||||
add_subdirectory(providers/mlx5/man)
|
||||
-add_subdirectory(providers/mthca)
|
||||
-add_subdirectory(providers/ocrdma)
|
||||
+#add_subdirectory(providers/mthca)
|
||||
+#add_subdirectory(providers/ocrdma)
|
||||
add_subdirectory(providers/qedr)
|
||||
add_subdirectory(providers/vmw_pvrdma)
|
||||
endif()
|
||||
|
||||
add_subdirectory(providers/hfi1verbs)
|
||||
-add_subdirectory(providers/ipathverbs)
|
||||
+#add_subdirectory(providers/ipathverbs)
|
||||
add_subdirectory(providers/rxe)
|
||||
add_subdirectory(providers/rxe/man)
|
||||
add_subdirectory(providers/siw)
|
||||
--
|
||||
2.40.1
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From 1c63f25b55ca4f5317e1c85b548469bbc747e147 Mon Sep 17 00:00:00 2001
|
||||
From: "Goldman, Adam" <adam.goldman@intel.com>
|
||||
Date: Tue, 4 Feb 2020 08:55:20 -0500
|
||||
Subject: [PATCH] kernel-boot: Do not perform device rename on OPA devices
|
||||
|
||||
PSM2 will not run with recent rdma-core releases. Several tools and
|
||||
libraries like PSM2, require the hfi1 name to be present.
|
||||
|
||||
Recent rdma-core releases added a new feature to rename kernel devices,
|
||||
but the default configuration will not work with hfi1 fabrics.
|
||||
|
||||
Related opa-psm2 github issue:
|
||||
https://github.com/intel/opa-psm2/issues/43
|
||||
|
||||
Fixes: 5b4099d47be3 ("kernel-boot: Perform device rename to make stable names")
|
||||
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
|
||||
Signed-off-by: Goldman, Adam <adam.goldman@intel.com>
|
||||
---
|
||||
kernel-boot/rdma-persistent-naming.rules | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/kernel-boot/rdma-persistent-naming.rules b/kernel-boot/rdma-persistent-naming.rules
|
||||
index 6f9c53a5..3ce34ea9 100644
|
||||
--- a/kernel-boot/rdma-persistent-naming.rules
|
||||
+++ b/kernel-boot/rdma-persistent-naming.rules
|
||||
@@ -26,10 +26,10 @@
|
||||
# Device type = RoCE
|
||||
# mlx5_0 -> rocex525400c0fe123455
|
||||
#
|
||||
-ACTION=="add", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FALLBACK"
|
||||
+ACTION=="add", SUBSYSTEM=="infiniband", KERNEL!="hfi1*", PROGRAM="rdma_rename %k NAME_FALLBACK"
|
||||
|
||||
# Example:
|
||||
# * NAME_FIXED
|
||||
# fixed name for specific board_id
|
||||
#
|
||||
-#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"
|
||||
\ No newline at end of file
|
||||
+#ACTION=="add", ATTR{board_id}=="MSF0010110035", SUBSYSTEM=="infiniband", PROGRAM="rdma_rename %k NAME_FIXED myib"
|
||||
--
|
||||
2.30.1
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
Name: rdma-core
|
||||
Version: 35.0
|
||||
Release: 1%{?dist}
|
||||
Version: 46.0
|
||||
Release: 1%{?dist}.1
|
||||
Summary: RDMA core userspace libraries and daemons
|
||||
|
||||
# Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
|
||||
|
@ -16,10 +16,12 @@ Source1: ibdev2netdev
|
|||
# are extracted from libibverbs-26.0-8.el8 .
|
||||
Source2: rxe_cfg
|
||||
Source3: rxe_cfg.8.gz
|
||||
Patch3: udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch
|
||||
# RHEL specific patch for OPA ibacm plugin
|
||||
Patch300: 0001-ibacm-acm.c-load-plugin-while-it-is-soft-link.patch
|
||||
Patch301: 0001-Only-load-i40iw-for-i40e-device-with-specific-PCI-ID.patch
|
||||
Patch301: 0002-systemd-drop-Protect-options-not-supported-in-RHEL-8.patch
|
||||
Patch9000: 0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch
|
||||
Patch9998: 9998-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch
|
||||
Patch9999: 9999-udev-keep-NAME_KERNEL-as-default-interface-naming-co.patch
|
||||
# Do not build static libs by default.
|
||||
%define with_static %{?_with_static: 1} %{?!_with_static: 0}
|
||||
|
||||
|
@ -86,13 +88,12 @@ BuildRequires: make
|
|||
BuildRequires: pandoc
|
||||
|
||||
%description
|
||||
RDMA core userspace infrastructure and documentation, including kernel
|
||||
driver-specific modprobe override configs, IPoIB network scripts,
|
||||
dracut rules, and the rdma-ndd utility.
|
||||
RDMA core userspace infrastructure and documentation, including initialization
|
||||
scripts, kernel driver-specific modprobe override configs, IPoIB network
|
||||
scripts, dracut rules, and the rdma-ndd utility.
|
||||
|
||||
%package devel
|
||||
Summary: RDMA core development libraries and headers
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: libibverbs%{?_isa} = %{version}-%{release}
|
||||
Provides: libibverbs-devel = %{version}-%{release}
|
||||
Obsoletes: libibverbs-devel < %{version}-%{release}
|
||||
|
@ -102,7 +103,6 @@ Obsoletes: libibumad-devel < %{version}-%{release}
|
|||
Requires: librdmacm%{?_isa} = %{version}-%{release}
|
||||
Provides: librdmacm-devel = %{version}-%{release}
|
||||
Obsoletes: librdmacm-devel < %{version}-%{release}
|
||||
Requires: ibacm%{?_isa} = %{version}-%{release}
|
||||
Provides: ibacm-devel = %{version}-%{release}
|
||||
Obsoletes: ibacm-devel < %{version}-%{release}
|
||||
Requires: infiniband-diags%{?_isa} = %{version}-%{release}
|
||||
|
@ -110,6 +110,13 @@ Provides: infiniband-diags-devel = %{version}-%{release}
|
|||
Obsoletes: infiniband-diags-devel < %{version}-%{release}
|
||||
Provides: libibmad-devel = %{version}-%{release}
|
||||
Obsoletes: libibmad-devel < %{version}-%{release}
|
||||
%if %{with_static}
|
||||
# Since our pkg-config files include private references to these packages they
|
||||
# need to have their .pc files installed too, even for dynamic linking, or
|
||||
# pkg-config breaks.
|
||||
BuildRequires: pkgconfig(libnl-3.0)
|
||||
BuildRequires: pkgconfig(libnl-route-3.0)
|
||||
%endif
|
||||
|
||||
%description devel
|
||||
RDMA core development libraries and headers.
|
||||
|
@ -130,15 +137,16 @@ programs. These include MAD, SA, SMP, and other basic IB functions.
|
|||
|
||||
%package -n libibverbs
|
||||
Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP/RoCE) hardware
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Provides: libcxgb4 = %{version}-%{release}
|
||||
Obsoletes: libcxgb4 < %{version}-%{release}
|
||||
Provides: libefa = %{version}-%{release}
|
||||
Obsoletes: libefa < %{version}-%{release}
|
||||
Provides: libhfi1 = %{version}-%{release}
|
||||
Obsoletes: libhfi1 < %{version}-%{release}
|
||||
Provides: libi40iw = %{version}-%{release}
|
||||
Obsoletes: libi40iw < %{version}-%{release}
|
||||
Provides: libirdma = %{version}-%{release}
|
||||
Obsoletes: libirdma < %{version}-%{release}
|
||||
Provides: libmana = %{version}-%{release}
|
||||
Obsoletes: libmana < %{version}-%{release}
|
||||
Provides: libmlx4 = %{version}-%{release}
|
||||
Obsoletes: libmlx4 < %{version}-%{release}
|
||||
%ifnarch s390
|
||||
|
@ -162,7 +170,8 @@ Device-specific plug-in ibverbs userspace drivers are included:
|
|||
- libefa: Amazon Elastic Fabric Adapter
|
||||
- libhfi1: Intel Omni-Path HFI
|
||||
- libhns: HiSilicon Hip06 SoC
|
||||
- libi40iw: Intel Ethernet Connection X722 RDMA
|
||||
- libirdma: Intel Ethernet Connection RDMA
|
||||
- libmana: Microsoft Azure Network Adapter
|
||||
- libmlx4: Mellanox ConnectX-3 InfiniBand HCA
|
||||
- libmlx5: Mellanox Connect-IB/X-4+ InfiniBand HCA
|
||||
- libqedr: QLogic QL4xxx RoCE HCA
|
||||
|
@ -184,7 +193,6 @@ displays information about RDMA devices.
|
|||
%package -n ibacm
|
||||
Summary: InfiniBand Communication Manager Assistant
|
||||
%{?systemd_requires}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: libibumad%{?_isa} = %{version}-%{release}
|
||||
Requires: libibverbs%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
@ -201,7 +209,6 @@ library knows how to talk directly to the ibacm daemon to retrieve data.
|
|||
%package -n iwpmd
|
||||
Summary: iWarp Port Mapper userspace daemon
|
||||
%{?systemd_requires}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n iwpmd
|
||||
iwpmd provides a userspace service for iWarp drivers to claim
|
||||
|
@ -209,7 +216,6 @@ tcp ports through the standard socket interface.
|
|||
|
||||
%package -n libibumad
|
||||
Summary: OpenFabrics Alliance InfiniBand umad (userspace management datagram) library
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n libibumad
|
||||
libibumad provides the userspace management datagram (umad) library
|
||||
|
@ -218,7 +224,6 @@ are used by the IB diagnostic and management tools, including OpenSM.
|
|||
|
||||
%package -n librdmacm
|
||||
Summary: Userspace RDMA Connection Manager
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: libibverbs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n librdmacm
|
||||
|
@ -238,7 +243,6 @@ Obsoletes: srptools <= 1.0.3
|
|||
Provides: srptools = %{version}-%{release}
|
||||
Obsoletes: openib-srptools <= 0.0.6
|
||||
%{?systemd_requires}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: libibumad%{?_isa} = %{version}-%{release}
|
||||
Requires: libibverbs%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
@ -260,9 +264,15 @@ easy, object-oriented access to IB verbs.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch3 -p1
|
||||
%patch300 -p1
|
||||
%patch301 -p1
|
||||
%if 0%{?fedora}
|
||||
%patch9998 -p1
|
||||
%endif
|
||||
%if 0%{?rhel}
|
||||
%patch9000 -p1
|
||||
%patch9999 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
|
||||
|
@ -293,7 +303,7 @@ easy, object-oriented access to IB verbs.
|
|||
-DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \
|
||||
-DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \
|
||||
-DCMAKE_INSTALL_PERLDIR:PATH=%{perl_vendorlib} \
|
||||
-DWITH_IBDIAGS_COMPAT:BOOL=False \
|
||||
-DENABLE_IBDIAGS_COMPAT:BOOL=False \
|
||||
%if %{with_static}
|
||||
-DENABLE_STATIC=1 \
|
||||
%endif
|
||||
|
@ -317,7 +327,6 @@ mkdir -p %{buildroot}/%{_sysconfdir}/rdma
|
|||
# Red Hat specific glue
|
||||
%global dracutlibdir %{_prefix}/lib/dracut
|
||||
%global sysmodprobedir %{_prefix}/lib/modprobe.d
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
|
||||
mkdir -p %{buildroot}%{_libexecdir}
|
||||
mkdir -p %{buildroot}%{_udevrulesdir}
|
||||
mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma
|
||||
|
@ -345,17 +354,11 @@ install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/
|
|||
# Delete the package's init.d scripts
|
||||
rm -rf %{buildroot}/%{_initrddir}/
|
||||
|
||||
# Remove ibverbs provider libs we don't support
|
||||
rm -f %{buildroot}/%{_libdir}/libibverbs/libcxgb3-rdmav*.so
|
||||
rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/cxgb3.driver
|
||||
rm -f %{buildroot}/%{_libdir}/libibverbs/libocrdma-rdmav*.so
|
||||
rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/ocrdma.driver
|
||||
rm -f %{buildroot}/%{_libdir}/libibverbs/libnes-rdmav*.so
|
||||
rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/nes.driver
|
||||
rm -f %{buildroot}/%{_libdir}/libibverbs/libmthca-rdmav*.so
|
||||
rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/mthca.driver
|
||||
rm -f %{buildroot}/%{_libdir}/libibverbs/libipathverbs-rdmav*.so
|
||||
rm -f %{buildroot}/%{_sysconfdir}/libibverbs.d/ipathverbs.driver
|
||||
%ldconfig_scriptlets -n libibverbs
|
||||
|
||||
%ldconfig_scriptlets -n libibumad
|
||||
|
||||
%ldconfig_scriptlets -n librdmacm
|
||||
|
||||
%post -n rdma-core
|
||||
if [ -x /sbin/udevadm ]; then
|
||||
|
@ -364,22 +367,6 @@ if [ -x /sbin/udevadm ]; then
|
|||
/sbin/udevadm trigger --subsystem-match=infiniband_mad --action=change || true
|
||||
fi
|
||||
|
||||
%post -n infiniband-diags -p /sbin/ldconfig
|
||||
%postun -n infiniband-diags
|
||||
%ldconfig_postun
|
||||
|
||||
%post -n libibverbs -p /sbin/ldconfig
|
||||
%postun -n libibverbs
|
||||
%ldconfig_postun
|
||||
|
||||
%post -n libibumad -p /sbin/ldconfig
|
||||
%postun -n libibumad
|
||||
%ldconfig_postun
|
||||
|
||||
%post -n librdmacm -p /sbin/ldconfig
|
||||
%postun -n librdmacm
|
||||
%ldconfig_postun
|
||||
|
||||
%post -n ibacm
|
||||
%systemd_post ibacm.service
|
||||
%preun -n ibacm
|
||||
|
@ -404,20 +391,21 @@ fi
|
|||
%files
|
||||
%dir %{_sysconfdir}/rdma
|
||||
%dir %{_docdir}/%{name}
|
||||
%doc %{_docdir}/%{name}/70-persistent-ipoib.rules
|
||||
%doc %{_docdir}/%{name}/README.md
|
||||
%doc %{_docdir}/%{name}/rxe.md
|
||||
%doc %{_docdir}/%{name}/udev.md
|
||||
%doc %{_docdir}/%{name}/tag_matching.md
|
||||
%config(noreplace) %{_sysconfdir}/rdma/mlx4.conf
|
||||
%config(noreplace) %{_sysconfdir}/rdma/modules/infiniband.conf
|
||||
%config(noreplace) %{_sysconfdir}/rdma/modules/iwarp.conf
|
||||
%config(noreplace) %{_sysconfdir}/rdma/modules/opa.conf
|
||||
%config(noreplace) %{_sysconfdir}/rdma/modules/rdma.conf
|
||||
%config(noreplace) %{_sysconfdir}/rdma/modules/roce.conf
|
||||
%config(noreplace) %{_sysconfdir}/udev/rules.d/*
|
||||
%dir %{_sysconfdir}/modprobe.d
|
||||
%ifnarch s390
|
||||
%config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf
|
||||
%endif
|
||||
%config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf
|
||||
%{_unitdir}/rdma-hw.target
|
||||
%{_unitdir}/rdma-load-modules@.service
|
||||
%dir %{dracutlibdir}
|
||||
|
@ -435,7 +423,6 @@ fi
|
|||
%dir %{sysmodprobedir}
|
||||
%{sysmodprobedir}/libmlx4.conf
|
||||
%{_libexecdir}/mlx4-setup.sh
|
||||
%{_libexecdir}/truescale-serdes.cmds
|
||||
%{_sbindir}/rdma-ndd
|
||||
%{_bindir}/ibdev2netdev
|
||||
%{_unitdir}/rdma-ndd.service
|
||||
|
@ -463,9 +450,11 @@ fi
|
|||
%ifnarch s390
|
||||
%{_mandir}/man3/mlx5dv*
|
||||
%{_mandir}/man3/mlx4dv*
|
||||
%{_mandir}/man3/manadv*
|
||||
%{_mandir}/man7/efadv*
|
||||
%{_mandir}/man7/mlx5dv*
|
||||
%{_mandir}/man7/mlx4dv*
|
||||
%{_mandir}/man7/manadv*
|
||||
%endif
|
||||
%{_mandir}/man3/ibnd_*
|
||||
|
||||
|
@ -546,16 +535,10 @@ fi
|
|||
%ifnarch s390
|
||||
%{_libdir}/libmlx5.so.*
|
||||
%{_libdir}/libmlx4.so.*
|
||||
%{_libdir}/libmana.so.*
|
||||
%endif
|
||||
%config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver
|
||||
%doc %{_docdir}/%{name}/libibverbs.md
|
||||
%doc %{_docdir}/%{name}/rxe.md
|
||||
%doc %{_docdir}/%{name}/tag_matching.md
|
||||
%{_mandir}/man7/rxe*
|
||||
%ifnarch s390
|
||||
%{_mandir}/man7/mlx4dv*
|
||||
%{_mandir}/man7/mlx5dv*
|
||||
%endif
|
||||
|
||||
%files -n libibverbs-utils
|
||||
%{_bindir}/ibv_*
|
||||
|
@ -592,7 +575,7 @@ fi
|
|||
%files -n librdmacm
|
||||
%{_libdir}/librdmacm*.so.*
|
||||
%dir %{_libdir}/rsocket
|
||||
%{_libdir}/rsocket/librspreload.so*
|
||||
%{_libdir}/rsocket/*.so*
|
||||
%doc %{_docdir}/%{name}/librdmacm.md
|
||||
%{_mandir}/man7/rsocket.*
|
||||
|
||||
|
@ -648,6 +631,34 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue May 30 2023 Kamal Heib <kheib@redhat.com> - 46.0-1.1
|
||||
- Add gating tests
|
||||
- Resolves: rhbz#2170066
|
||||
|
||||
* Thu May 25 2023 Kamal Heib <kheib@redhat.com> - 46.0-1
|
||||
- Rebase to upstream release v46.0
|
||||
- Resolves: rhbz#2170066, rhbz#2209685, rhbz#2159635, rhbz#2167517
|
||||
|
||||
* Wed Feb 08 2023 Michal Schmidt <mschmidt@redhat.com> - 44.0-2.1
|
||||
- Do not use unsupported Protect* options in systemd unit files.
|
||||
- Resolves: rhbz#2141462
|
||||
|
||||
* Wed Feb 08 2023 Michal Schmidt <mschmidt@redhat.com> - 44.0-2
|
||||
- Update to upstream release v44.0
|
||||
- Resolves: rhbz#2110934, rhbz#2112931, rhbz#2142691
|
||||
|
||||
* Fri Aug 05 2022 Michal Schmidt <mschmidt@redhat.com> - 41.0-1
|
||||
- Update to upstream release v41.0
|
||||
- Resolves: rhbz#2049518
|
||||
|
||||
* Thu Jan 06 2022 Honggang Li <honli@redhat.com> - 37.2-1
|
||||
- Update to upstream v37.2 release for fixes
|
||||
- Resolves: bz2008509, bz2024865, bz1915555
|
||||
|
||||
* Tue Nov 09 2021 Honggang Li <honli@redhat.com> - 37.1-1
|
||||
- Update to upstream v37.1 release for features and fixes
|
||||
- Resolves: bz1982200, bz1990120, bz1982131
|
||||
|
||||
* Fri May 14 2021 Honggang Li <honli@redhat.com> - 35.0-1
|
||||
- Update to upstream v35 release for features and fixes
|
||||
- Resolves: bz1915311
|
||||
|
|
Loading…
Reference in New Issue