diff --git a/.gitignore b/.gitignore index d1ec87b..37d037d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /rdma-core-51.0.tar.gz /rdma-core-54.0.tar.gz /rdma-core-57.0.tar.gz +/rdma-core-60.0.tar.gz diff --git a/rdma-core.spec b/rdma-core.spec index 1620706..de9ff60 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core -Version: 57.0 -Release: 2%{?dist} +Version: 60.0 +Release: 1%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -10,8 +10,6 @@ Summary: RDMA core userspace libraries and daemons License: GPLv2 or BSD Url: https://github.com/linux-rdma/rdma-core Source: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz -Patch0001: 0001-tests-Ensure-graceful-resource-cleaning.patch -Patch0002: 0002-pyverbs-Change-PD-object-return-type.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. @@ -268,8 +266,6 @@ easy, object-oriented access to IB verbs. %prep %setup -q -%patch -P 0001 -p1 -%patch -P 0002 -p1 %if 0%{?fedora} %patch -P 9998 -p1 %endif @@ -332,10 +328,10 @@ mkdir -p %{buildroot}/%{_sysconfdir}/rdma %global sysmodprobedir %{_prefix}/lib/modprobe.d mkdir -p %{buildroot}%{_libexecdir} mkdir -p %{buildroot}%{_udevrulesdir} -mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma +mkdir -p %{buildroot}%{dracutlibdir}/modules.d/50rdma mkdir -p %{buildroot}%{sysmodprobedir} install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf -install -D -m0755 redhat/rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh +install -D -m0755 kernel-boot/dracut/50rdma/module-setup.sh %{buildroot}%{dracutlibdir}/modules.d/50rdma/module-setup.sh install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh rm -f %{buildroot}%{_sysconfdir}/rdma/modules/rdma.conf @@ -416,8 +412,8 @@ fi %{_unitdir}/rdma-load-modules@.service %dir %{dracutlibdir} %dir %{dracutlibdir}/modules.d -%dir %{dracutlibdir}/modules.d/05rdma -%{dracutlibdir}/modules.d/05rdma/module-setup.sh +%dir %{dracutlibdir}/modules.d/50rdma +%{dracutlibdir}/modules.d/50rdma/module-setup.sh %dir %{_udevrulesdir} %{_udevrulesdir}/../rdma_rename %{_udevrulesdir}/60-rdma-ndd.rules @@ -633,6 +629,10 @@ fi %endif %changelog +* Mon Dec 01 2025 Kamal Heib - 60.0-1 +- Rebase to upstream release v60.0 +- Resolves: RHEL-98270, RHEL-100679, RHEL-97696, RHEL-97692, RHEL-97648, RHEL-95331 + * Thu Aug 07 2025 Kamal Heib - 57.0-2 - Fix pyverbs tests - Resolves: RHEL-107929, RHEL-107930 diff --git a/sources b/sources index feb1d68..de3de76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rdma-core-57.0.tar.gz) = 4a904d34af6863655545fe720cc25a8800684f63c51cebb67be2058363949217903957dc925c69d41294362ccff75fb0d37f3bc31cd6f6f252a804d6713f62cf +SHA512 (rdma-core-60.0.tar.gz) = e1e4d95b42b2374145b5f1e06ff82da39e4f9d4ec7bada3d4e931efad30281d7ceed80f1150b5de506a6d756b6f360ac5eff3ec6bbb79684a17008b551308d50