diff --git a/SPECS-SIGNED/fwctl-hwe-signed/fwctl-hwe-signed.spec b/SPECS-SIGNED/fwctl-hwe-signed/fwctl-hwe-signed.spec index c3edd410593..c59178961de 100644 --- a/SPECS-SIGNED/fwctl-hwe-signed/fwctl-hwe-signed.spec +++ b/SPECS-SIGNED/fwctl-hwe-signed/fwctl-hwe-signed.spec @@ -43,12 +43,12 @@ %global KVERSION %{target_kernel_version_full} %{!?_name: %define _name fwctl-hwe} -%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}} Summary: %{_name} Driver Name: %{_name}-signed Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://nvidia.com Group: System Environment/Base @@ -73,7 +73,7 @@ fwctl signed kernel modules %package -n %{_name} Summary: %{summary} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -120,6 +120,9 @@ fi # 1 : closed %config(noreplace) %{_sysconfdir}/depmod.d/zz02-fwctl-*.conf %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe - Fix signed spec for -hwe variant diff --git a/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec b/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec index 753ffe5286a..82b30535089 100644 --- a/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec +++ b/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec @@ -42,12 +42,12 @@ %global KVERSION %{target_kernel_version_full} %{!?_name: %define _name fwctl} -%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}} Summary: %{_name} Driver Name: %{_name}-signed Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://nvidia.com Group: System Environment/Base @@ -119,6 +119,9 @@ fi # 1 : closed %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS-SIGNED/iser-hwe-signed/iser-hwe-signed.spec b/SPECS-SIGNED/iser-hwe-signed/iser-hwe-signed.spec index 15b25d93c8b..578b2446001 100644 --- a/SPECS-SIGNED/iser-hwe-signed/iser-hwe-signed.spec +++ b/SPECS-SIGNED/iser-hwe-signed/iser-hwe-signed.spec @@ -39,12 +39,12 @@ %global KVERSION %{target_kernel_version_full} %{!?_name: %define _name iser-hwe} -%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}} Summary: %{_name} Driver Name: %{_name}-signed Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -68,7 +68,7 @@ iser signed kernel modules %package -n %{_name} Summary: %{summary} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -112,6 +112,9 @@ fi # 1 : closed %config(noreplace) %{_sysconfdir}/depmod.d/zz02-iser-*.conf %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe - Fix signed spec for -hwe variant diff --git a/SPECS-SIGNED/iser-signed/iser-signed.spec b/SPECS-SIGNED/iser-signed/iser-signed.spec index f0880221271..997593ac32b 100644 --- a/SPECS-SIGNED/iser-signed/iser-signed.spec +++ b/SPECS-SIGNED/iser-signed/iser-signed.spec @@ -38,12 +38,12 @@ %global KVERSION %{target_kernel_version_full} %{!?_name: %define _name iser} -%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}} Summary: %{_name} Driver Name: %{_name}-signed Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -110,6 +110,9 @@ fi # 1 : closed %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{_name}-*.conf %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS-SIGNED/isert-hwe-signed/isert-hwe-signed.spec b/SPECS-SIGNED/isert-hwe-signed/isert-hwe-signed.spec index 600435d02ed..4cf93c6c1b1 100644 --- a/SPECS-SIGNED/isert-hwe-signed/isert-hwe-signed.spec +++ b/SPECS-SIGNED/isert-hwe-signed/isert-hwe-signed.spec @@ -39,12 +39,12 @@ %global KVERSION %{target_kernel_version_full} %{!?_name: %define _name isert-hwe} -%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}} Summary: %{_name} Driver Name: %{_name}-signed Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -68,7 +68,7 @@ isert signed kernel modules %package -n %{_name} Summary: %{summary} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -111,6 +111,9 @@ fi # 1 : closed %config(noreplace) %{_sysconfdir}/depmod.d/zz02-isert-*.conf %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe - Fix signed spec for -hwe variant diff --git a/SPECS-SIGNED/isert-signed/isert-signed.spec b/SPECS-SIGNED/isert-signed/isert-signed.spec index 0f50113e097..7029baea58a 100644 --- a/SPECS-SIGNED/isert-signed/isert-signed.spec +++ b/SPECS-SIGNED/isert-signed/isert-signed.spec @@ -38,12 +38,12 @@ %global KVERSION %{target_kernel_version_full} %{!?_name: %define _name isert} -%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}} Summary: %{_name} Driver Name: %{_name}-signed Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -109,6 +109,9 @@ fi # 1 : closed %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{_name}-*.conf %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS-SIGNED/knem-hwe-modules-signed/knem-hwe-modules-signed.spec b/SPECS-SIGNED/knem-hwe-modules-signed/knem-hwe-modules-signed.spec index e7632279d13..35f67ad633a 100644 --- a/SPECS-SIGNED/knem-hwe-modules-signed/knem-hwe-modules-signed.spec +++ b/SPECS-SIGNED/knem-hwe-modules-signed/knem-hwe-modules-signed.spec @@ -44,7 +44,7 @@ Summary: KNEM: High-Performance Intra-Node MPI Communication Name: %{_name}-signed Version: 1.1.4.90mlnx3 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} Provides: knem-hwe-mlnx = %{version}-%{release} Obsoletes: knem-hwe-mlnx < %{version}-%{release} License: BSD and GPLv2 @@ -110,6 +110,9 @@ fi /lib/modules/ %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 1.1.4.90mlnx3-23_6.12.50.2-1 +- Bump release to rebuild for new release + * Fri Oct 06 2025 Siddharth Chintamaneni - 1.1.4.90mlnx3-22_6.12.50.2-1 - Bump to match kernel-hwe - Fix signed spec for -hwe variant diff --git a/SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec b/SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec index 7948df13f51..9a427ae2296 100644 --- a/SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec +++ b/SPECS-SIGNED/knem-modules-signed/knem-modules-signed.spec @@ -43,7 +43,7 @@ Summary: KNEM: High-Performance Intra-Node MPI Communication Name: %{_name}-signed Version: 1.1.4.90mlnx3 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} Provides: knem-mlnx = %{version}-%{release} Obsoletes: knem-mlnx < %{version}-%{release} License: BSD and GPLv2 @@ -108,6 +108,9 @@ fi /lib/modules/ %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 1.1.4.90mlnx3-21 +- Bump release to rebuild for new release + * Thu May 29 2025 Nicolas Guibourge - 1.1.4.90mlnx3-20 - Add kernel version and release nb into release nb diff --git a/SPECS-SIGNED/mft_kernel-hwe-signed/mft_kernel-hwe-signed.spec b/SPECS-SIGNED/mft_kernel-hwe-signed/mft_kernel-hwe-signed.spec index cc001efa5b4..bf29d857ec8 100644 --- a/SPECS-SIGNED/mft_kernel-hwe-signed/mft_kernel-hwe-signed.spec +++ b/SPECS-SIGNED/mft_kernel-hwe-signed/mft_kernel-hwe-signed.spec @@ -15,7 +15,7 @@ Name: %{_name}-signed Summary: %{_name} Kernel Module for the %{KVERSION} kernel Version: 4.30.0 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: Dual BSD/GPLv2 Group: System Environment/Kernel @@ -84,6 +84,9 @@ popd /lib/modules/%{KVERSION}/updates/ %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 4.30.0-23_6.12.50.2-1 +- Bump release to rebuild for new release + * Fri Oct 06 2025 Siddharth Chintamaneni - 4.30.0-22_6.12.50.2-1 - Bump to match kernel-hwe - Fix signed spec for -hwe variant diff --git a/SPECS-SIGNED/mlnx-nfsrdma-hwe-signed/mlnx-nfsrdma-hwe-signed.spec b/SPECS-SIGNED/mlnx-nfsrdma-hwe-signed/mlnx-nfsrdma-hwe-signed.spec index 3488cb4cd63..51f5c65076d 100644 --- a/SPECS-SIGNED/mlnx-nfsrdma-hwe-signed/mlnx-nfsrdma-hwe-signed.spec +++ b/SPECS-SIGNED/mlnx-nfsrdma-hwe-signed/mlnx-nfsrdma-hwe-signed.spec @@ -38,14 +38,14 @@ %global KVERSION %{target_kernel_version_full} -%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}} %{!?_name: %define _name mlnx-nfsrdma-hwe} Summary: %{_name} Driver Name: %{_name}-signed Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -71,7 +71,7 @@ mellanox rdma signed kernel modules %package -n %{_name} Summary: %{summary} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -119,6 +119,9 @@ fi %config(noreplace) %{_sysconfdir}/depmod.d/zz02-mlnx-nfsrdma-*.conf %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe - Fix signed spec for -hwe variant diff --git a/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec b/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec index 2c2c33a72c9..2818e2066ca 100644 --- a/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec +++ b/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec @@ -37,14 +37,14 @@ %global KVERSION %{target_kernel_version_full} -%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}} %{!?_name: %define _name mlnx-nfsrdma} Summary: %{_name} Driver Name: %{_name}-signed Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -117,6 +117,9 @@ fi %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{_name}-*.conf %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS-SIGNED/mlnx-ofa_kernel-hwe-modules-signed/mlnx-ofa_kernel-hwe-modules-signed.spec b/SPECS-SIGNED/mlnx-ofa_kernel-hwe-modules-signed/mlnx-ofa_kernel-hwe-modules-signed.spec index b83e1216468..313d59d9634 100644 --- a/SPECS-SIGNED/mlnx-ofa_kernel-hwe-modules-signed/mlnx-ofa_kernel-hwe-modules-signed.spec +++ b/SPECS-SIGNED/mlnx-ofa_kernel-hwe-modules-signed/mlnx-ofa_kernel-hwe-modules-signed.spec @@ -46,7 +46,7 @@ Summary: Infiniband HCA Driver Name: %{_name}-signed Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com/ Group: System Environment/Base @@ -194,6 +194,9 @@ fi %license %{_datadir}/licenses/%{_name}/copyright %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Bump release to rebuild for new release + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe - Fix signed spec for -hwe variant diff --git a/SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec b/SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec index 069f856b765..ffc7688967b 100644 --- a/SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec +++ b/SPECS-SIGNED/mlnx-ofa_kernel-modules-signed/mlnx-ofa_kernel-modules-signed.spec @@ -45,7 +45,7 @@ Summary: Infiniband HCA Driver Name: %{_name}-signed Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com/ Group: System Environment/Base @@ -192,6 +192,9 @@ fi %license %{_datadir}/licenses/%{_name}/copyright %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump release to rebuild for new release + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS-SIGNED/srp-hwe-signed/srp-hwe-signed.spec b/SPECS-SIGNED/srp-hwe-signed/srp-hwe-signed.spec index 8949e571531..8608b1b0ca5 100644 --- a/SPECS-SIGNED/srp-hwe-signed/srp-hwe-signed.spec +++ b/SPECS-SIGNED/srp-hwe-signed/srp-hwe-signed.spec @@ -43,12 +43,12 @@ %global KVERSION %{target_kernel_version_full} %define _name srp-hwe -%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}} Summary: srp driver Name: %{_name}-signed Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -73,7 +73,7 @@ srp kernel modules %package -n %{_name} Summary: %{summary} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -112,6 +112,9 @@ popd %license %{_datadir}/licenses/%{_name}/copyright %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe - Fix signed spec for -hwe variant diff --git a/SPECS-SIGNED/srp-signed/srp-signed.spec b/SPECS-SIGNED/srp-signed/srp-signed.spec index 5d752a73673..afa60162259 100644 --- a/SPECS-SIGNED/srp-signed/srp-signed.spec +++ b/SPECS-SIGNED/srp-signed/srp-signed.spec @@ -42,12 +42,12 @@ %global KVERSION %{target_kernel_version_full} %define _name srp -%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}} Summary: srp driver Name: %{_name}-signed Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -110,6 +110,9 @@ popd %license %{_datadir}/licenses/%{_name}/copyright %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS-SIGNED/xpmem-hwe-modules-signed/xpmem-hwe-modules-signed.spec b/SPECS-SIGNED/xpmem-hwe-modules-signed/xpmem-hwe-modules-signed.spec index 1b47a8cbf43..80391f6cfc2 100644 --- a/SPECS-SIGNED/xpmem-hwe-modules-signed/xpmem-hwe-modules-signed.spec +++ b/SPECS-SIGNED/xpmem-hwe-modules-signed/xpmem-hwe-modules-signed.spec @@ -13,7 +13,7 @@ %global KVERSION %{target_kernel_version_full} %define _name xpmem-hwe-modules -%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}} # xpmem-modules is a sub-package in SPECS/xpmem. # We are making that into a main package for signing. @@ -21,7 +21,7 @@ Summary: Cross-partition memory Name: %{_name}-signed Version: 2.7.4 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 and LGPLv2.1 Group: System Environment/Libraries Vendor: Microsoft Corporation @@ -50,7 +50,7 @@ This package includes the kernel module. %package -n %{_name} Summary: %{summary} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -86,21 +86,18 @@ popd %{_datadir}/licenses %post -n %{_name} -depmod %{KVERSION} -a -/sbin/modprobe -r xpmem > /dev/null 2>&1 -/sbin/modprobe xpmem > /dev/null 2>&1 +depmod %{KVERSION} %postun -n %{_name} -if [ "$1" = 0 ]; then - if lsmod | grep -qw xpmem; then - # If the module fails to unload, give an error, - # but don't fail uninstall. User should handle this - # Maybe the module is in use - rmmod xpmem || : - fi +if [ $1 = 0 ]; then # 1 : Erase, not upgrade + /sbin/depmod %{KVERSION} fi %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 2.7.4-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. +- Align %%post* scripts with other kmod packages. + * Fri Oct 06 2025 Siddharth Chintamaneni - 2.7.4-22_6.12.50.2-1 - Bump to match kernel-hwe - Fix signed spec for -hwe variant diff --git a/SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec b/SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec index b2badb554ac..eabd4056bb1 100644 --- a/SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec +++ b/SPECS-SIGNED/xpmem-modules-signed/xpmem-modules-signed.spec @@ -12,7 +12,7 @@ %global KVERSION %{target_kernel_version_full} %define _name xpmem-modules -%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}} # xpmem-modules is a sub-package in SPECS/xpmem. # We are making that into a main package for signing. @@ -20,7 +20,7 @@ Summary: Cross-partition memory Name: %{_name}-signed Version: 2.7.4 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 and LGPLv2.1 Group: System Environment/Libraries Vendor: Microsoft Corporation @@ -79,12 +79,24 @@ cp -rp ./. %{buildroot}/ popd +%post -n %{_name} +/sbin/depmod %{KVERSION} + +%postun -n %{_name} +if [ $1 = 0 ]; then # 1 : Erase, not upgrade + /sbin/depmod %{KVERSION} +fi + %files -n %{_name} /lib/modules/%{KVERSION}/updates/xpmem.ko %{_datadir}/licenses %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 2.7.4-21 +- Bump mofed release number +- Align %%post* scripts with other kmod packages. + * Thu May 29 2025 Nicolas Guibourge - 2.7.4-20 - Add kernel version and release nb into release nb diff --git a/SPECS/fwctl-hwe/fwctl-hwe.spec b/SPECS/fwctl-hwe/fwctl-hwe.spec index 766dbcddca5..b69758ffd26 100644 --- a/SPECS/fwctl-hwe/fwctl-hwe.spec +++ b/SPECS/fwctl-hwe/fwctl-hwe.spec @@ -45,7 +45,7 @@ %{!?_name: %define _name fwctl-hwe} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-23%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -71,7 +71,7 @@ Summary: %{_name} Driver Name: fwctl-hwe Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://nvidia.com Group: System Environment/Base @@ -88,9 +88,8 @@ BuildRequires: binutils BuildRequires: systemd BuildRequires: kmod BuildRequires: mlnx-ofa_kernel-hwe-devel = %{_mofed_full_version} -BuildRequires: mlnx-ofa_kernel-hwe-source = %{_mofed_full_version} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -254,6 +253,9 @@ fi # 1 : closed %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe diff --git a/SPECS/fwctl/fwctl.spec b/SPECS/fwctl/fwctl.spec index 2617f0eae1d..328ef424393 100644 --- a/SPECS/fwctl/fwctl.spec +++ b/SPECS/fwctl/fwctl.spec @@ -44,7 +44,7 @@ %{!?_name: %define _name fwctl} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-21%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -70,7 +70,7 @@ Summary: %{_name} Driver Name: fwctl Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://nvidia.com Group: System Environment/Base @@ -253,6 +253,9 @@ fi # 1 : closed %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS/iser-hwe/iser-hwe.spec b/SPECS/iser-hwe/iser-hwe.spec index d999979dd8e..0bb0b1e8c54 100644 --- a/SPECS/iser-hwe/iser-hwe.spec +++ b/SPECS/iser-hwe/iser-hwe.spec @@ -41,7 +41,7 @@ %{!?_name: %define _name iser-hwe} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-23%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -67,7 +67,7 @@ Summary: %{_name} Driver Name: iser-hwe Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -84,9 +84,8 @@ BuildRequires: binutils BuildRequires: systemd BuildRequires: kmod BuildRequires: mlnx-ofa_kernel-hwe-devel = %{_mofed_full_version} -BuildRequires: mlnx-ofa_kernel-hwe-source = %{_mofed_full_version} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -250,6 +249,9 @@ fi # 1 : closed %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe diff --git a/SPECS/iser/iser.spec b/SPECS/iser/iser.spec index a32c2da2fbb..8749dd80008 100644 --- a/SPECS/iser/iser.spec +++ b/SPECS/iser/iser.spec @@ -40,7 +40,7 @@ %{!?_name: %define _name iser} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-21%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -66,7 +66,7 @@ Summary: %{_name} Driver Name: iser Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -249,6 +249,9 @@ fi # 1 : closed %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS/isert-hwe/isert-hwe.spec b/SPECS/isert-hwe/isert-hwe.spec index c857d514e0a..1cfdb638980 100644 --- a/SPECS/isert-hwe/isert-hwe.spec +++ b/SPECS/isert-hwe/isert-hwe.spec @@ -41,7 +41,7 @@ %{!?_name: %define _name isert-hwe} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-23%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -67,7 +67,7 @@ Summary: %{_name}-hwe Driver Name: isert-hwe Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -84,9 +84,8 @@ BuildRequires: binutils BuildRequires: systemd BuildRequires: kmod BuildRequires: mlnx-ofa_kernel-hwe-devel = %{_mofed_full_version} -BuildRequires: mlnx-ofa_kernel-hwe-source = %{_mofed_full_version} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -250,6 +249,9 @@ fi # 1 : closed %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe diff --git a/SPECS/isert/isert.spec b/SPECS/isert/isert.spec index 969ee6325ba..51e587ffda9 100644 --- a/SPECS/isert/isert.spec +++ b/SPECS/isert/isert.spec @@ -40,7 +40,7 @@ %{!?_name: %define _name isert} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-21%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -66,7 +66,7 @@ Summary: %{_name} Driver Name: isert Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -249,6 +249,9 @@ fi # 1 : closed %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS/knem-hwe/knem-hwe.spec b/SPECS/knem-hwe/knem-hwe.spec index 821c6fe1740..9845b8260b9 100644 --- a/SPECS/knem-hwe/knem-hwe.spec +++ b/SPECS/knem-hwe/knem-hwe.spec @@ -55,7 +55,7 @@ Summary: KNEM: High-Performance Intra-Node MPI Communication Name: knem-hwe Version: 1.1.4.90mlnx3 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} Provides: knem-hwe-mlnx = %{version}-%{release} Obsoletes: knem-hwe-mlnx < %{version}-%{release} License: BSD and GPLv2 @@ -64,7 +64,6 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Source0: https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/knem-1.1.4.90mlnx3.tar.gz#/knem-%{version}.tar.gz BuildRoot: /var/tmp/%{name}-%{version}-build -ExclusiveArch: aarch64 BuildRequires: gcc BuildRequires: make @@ -73,11 +72,6 @@ BuildRequires: binutils BuildRequires: systemd BuildRequires: kmod -Requires: kernel-hwe = %{target_kernel_version_full} -Requires: kmod -Conflicts: knem - - %description KNEM is a Linux kernel module enabling high-performance intra-node MPI communication for large messages. KNEM offers support for asynchronous and vectorial data transfers as well as offloading memory copies on to Intel I/OAT hardware. See http://knem.gitlabpages.inria.fr for details. @@ -120,6 +114,10 @@ EOF) %package -n %{non_kmp_pname} Summary: KNEM: High-Performance Intra-Node MPI Communication Group: System Environment/Libraries +Requires: kernel-hwe = %{target_kernel_version_full} +Requires: kmod +ExclusiveArch: aarch64 + %description -n %{non_kmp_pname} KNEM is a Linux kernel module enabling high-performance intra-node MPI communication for large messages. KNEM offers support for asynchronous and vectorial data transfers as well as loading memory copies on to Intel I/OAT hardware. See http://runtime.bordeaux.inria.fr/knem/ for details. @@ -190,8 +188,6 @@ done export INSTALL_MOD_PATH=$RPM_BUILD_ROOT export INSTALL_MOD_DIR=%install_mod_dir export KPNAME=%{_name} -mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d -install -d $RPM_BUILD_ROOT/usr/lib64/pkgconfig for flavor in %flavors_to_build; do cd $PWD/obj/$flavor export KSRC=%{kernel_source $flavor} @@ -200,11 +196,11 @@ for flavor in %flavors_to_build; do export MODULE_DESTDIR=/lib/modules/$KVERSION/$INSTALL_MOD_DIR mkdir -p $RPM_BUILD_ROOT/lib/modules/$KVERSION/$INSTALL_MOD_DIR MODULE_DESTDIR=/lib/modules/$KVERSION/$INSTALL_MOD_DIR DESTDIR=$RPM_BUILD_ROOT KVERSION=$KVERSION $RPM_BUILD_ROOT/opt/knem-%{version}/sbin/knem_local_install - cp knem.pc $RPM_BUILD_ROOT/usr/lib64/pkgconfig cd - done -/bin/rm -rf %{buildroot}/opt/knem-%{version}/lib/modules || true +/bin/rm -rf %{buildroot}/opt/knem-%{version} +/bin/rm -rf %{buildroot}/etc/udev/rules.d %if %{IS_RHEL_VENDOR} # Set the module(s) to be executable, so that they will be stripped when packaged. @@ -219,38 +215,6 @@ echo "override knem * extra/%{_name}" >> $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/ find %{buildroot} \( -type f -name '*.ko' -o -name '*ko.gz' \) -exec %{__strip} -p --strip-debug --discard-locals -R .comment -R .note \{\} \; %endif -%clean -rm -rf $RPM_BUILD_ROOT - -%post -getent group rdma >/dev/null 2>&1 || groupadd -r rdma -touch /etc/udev/rules.d/10-knem.rules -# load knem -/sbin/modprobe -r knem > /dev/null 2>&1 -/sbin/modprobe knem > /dev/null 2>&1 - -# automatically load knem onboot -if [ -d /etc/sysconfig/modules ]; then - # RH - echo "/sbin/modprobe knem > /dev/null 2>&1" > /etc/sysconfig/modules/knem.modules - chmod +x /etc/sysconfig/modules/knem.modules -elif [ -e /etc/sysconfig/kernel ]; then - # SLES - if ! (grep -w knem /etc/sysconfig/kernel); then - sed -i -r -e 's/^(MODULES_LOADED_ON_BOOT=)"(.*)"/\1"\2 knem"/' /etc/sysconfig/kernel - fi -fi - -%preun -# unload knem -/sbin/modprobe -r knem > /dev/null 2>&1 -# RH -/bin/rm -f /etc/sysconfig/modules/knem.modules -# SLES -if (grep -qw knem /etc/sysconfig/kernel 2>/dev/null); then - sed -i -e 's/ knem//g' /etc/sysconfig/kernel 2>/dev/null -fi - %if "%{KMP}" != "1" %post -n %{non_kmp_pname} depmod %{KVERSION} -a @@ -261,15 +225,6 @@ if [ $1 = 0 ]; then # 1 : Erase, not upgrade fi %endif # end KMP=1 -%files -%defattr(-, root, root) -%license source/COPYING source/COPYING.BSD-3 source/COPYING.GPL-2 -/opt/knem-%{version} -/usr/lib64/pkgconfig/knem.pc - -%config(noreplace) -/etc/udev/rules.d/10-knem.rules - %if "%{KMP}" != "1" %files -n %{non_kmp_pname} @@ -283,6 +238,9 @@ fi %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 1.1.4.90mlnx3-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 1.1.4.90mlnx3-22_6.12.50.2-1 - Bump to match kernel-hwe diff --git a/SPECS/knem/knem.spec b/SPECS/knem/knem.spec index abb0f093fd9..9478444c099 100644 --- a/SPECS/knem/knem.spec +++ b/SPECS/knem/knem.spec @@ -54,7 +54,7 @@ Summary: KNEM: High-Performance Intra-Node MPI Communication Name: knem Version: 1.1.4.90mlnx3 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} Provides: knem-mlnx = %{version}-%{release} Obsoletes: knem-mlnx < %{version}-%{release} License: BSD and GPLv2 @@ -63,7 +63,6 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Source0: https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/knem-1.1.4.90mlnx3.tar.gz#/knem-%{version}.tar.gz BuildRoot: /var/tmp/%{name}-%{version}-build -ExclusiveArch: x86_64 BuildRequires: gcc BuildRequires: make @@ -73,7 +72,6 @@ BuildRequires: binutils BuildRequires: systemd BuildRequires: kmod -Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -116,12 +114,18 @@ EOF) %global kernel_release() %{KVERSION} %global flavors_to_build default +# We create the module package only for the x86_64 kernel +%ifarch x86_64 %package -n %{non_kmp_pname} Summary: KNEM: High-Performance Intra-Node MPI Communication Group: System Environment/Libraries + +Requires: kernel = %{target_kernel_version_full} + %description -n %{non_kmp_pname} KNEM is a Linux kernel module enabling high-performance intra-node MPI communication for large messages. KNEM offers support for asynchronous and vectorial data transfers as well as loading memory copies on to Intel I/OAT hardware. See http://runtime.bordeaux.inria.fr/knem/ for details. +%endif %endif #end if "%{KMP}" == "1" # @@ -199,6 +203,15 @@ for flavor in %flavors_to_build; do export MODULE_DESTDIR=/lib/modules/$KVERSION/$INSTALL_MOD_DIR mkdir -p $RPM_BUILD_ROOT/lib/modules/$KVERSION/$INSTALL_MOD_DIR MODULE_DESTDIR=/lib/modules/$KVERSION/$INSTALL_MOD_DIR DESTDIR=$RPM_BUILD_ROOT KVERSION=$KVERSION $RPM_BUILD_ROOT/opt/knem-%{version}/sbin/knem_local_install + +# For the default kernel, we create the module package only for the x86_64 kernel. +# Some other kernels (kernel-hwe for instance) get aarch64 modules packages built from other specs. +# We keep the user space packages like the module configs built only in this spec, though, +# and re-use them for kernel modules built for other kernel flavours and architectures. +%ifnarch x86_64 + rm -rf $RPM_BUILD_ROOT/$MODULE_DESTDIR +%endif + cp knem.pc $RPM_BUILD_ROOT/usr/lib64/pkgconfig cd - done @@ -251,6 +264,8 @@ if (grep -qw knem /etc/sysconfig/kernel 2>/dev/null); then fi %if "%{KMP}" != "1" +# We create the module package only for the x86_64 kernel +%ifarch x86_64 %post -n %{non_kmp_pname} depmod %{KVERSION} -a @@ -258,6 +273,7 @@ depmod %{KVERSION} -a if [ $1 = 0 ]; then # 1 : Erase, not upgrade depmod %{KVERSION} -a fi +%endif %endif # end KMP=1 %files @@ -271,6 +287,8 @@ fi %if "%{KMP}" != "1" +# We create the module package only for the x86_64 kernel +%ifarch x86_64 %files -n %{non_kmp_pname} %license source/COPYING source/COPYING.BSD-3 source/COPYING.GPL-2 /lib/modules/%{KVERSION}/%{install_mod_dir}/ @@ -280,8 +298,12 @@ fi %endif %endif %endif +%endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 1.1.4.90mlnx3-21 +- Adjusted package dependencies on user space components. + * Thu May 29 2025 Nicolas Guibourge - 1.1.4.90mlnx3-20 - Add kernel version and release nb into release nb diff --git a/SPECS/mft_kernel-hwe/mft_kernel-hwe.spec b/SPECS/mft_kernel-hwe/mft_kernel-hwe.spec index 5a462bae557..52de502c43b 100644 --- a/SPECS/mft_kernel-hwe/mft_kernel-hwe.spec +++ b/SPECS/mft_kernel-hwe/mft_kernel-hwe.spec @@ -36,7 +36,7 @@ Name: mft_kernel-hwe Summary: %{name} Kernel Module for the %{KVERSION} kernel Version: 4.30.0 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: Dual BSD/GPLv2 Group: System Environment/Kernel BuildRoot: /var/tmp/%{name}-%{version}-build @@ -87,15 +87,6 @@ EOF) %global kernel_release() %{KVERSION} %global flavors_to_build default %endif - -%if "%{KMP}" == "1" -%package utils -Summary: KO utils for MFT -Group: System Environment/Kernel -Vendor: Microsoft Corporation -%description utils -mft utils kernel module(s) -%endif # # setup module sign scripts if paths to the keys are given # @@ -219,16 +210,11 @@ find %{buildroot} -type f -name \*.ko -exec %{__strip} -p --strip-debug --discar %endif %endif %endif -%if "%{_cpu_arch}" == "ppc64" || "%{_cpu_arch}" == "ppc64le" -%if "%{KMP}" == "1" -%files utils -%defattr(-,root,root,-) -%license source/COPYING -%endif -%{docdir} -%endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 4.30.0-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 4.30.0-22_6.12.50.2-1 - Bump to match kernel-hwe diff --git a/SPECS/mlnx-nfsrdma-hwe/mlnx-nfsrdma-hwe.spec b/SPECS/mlnx-nfsrdma-hwe/mlnx-nfsrdma-hwe.spec index a9d07d8d80c..64523761690 100644 --- a/SPECS/mlnx-nfsrdma-hwe/mlnx-nfsrdma-hwe.spec +++ b/SPECS/mlnx-nfsrdma-hwe/mlnx-nfsrdma-hwe.spec @@ -42,7 +42,7 @@ %{!?_name: %define _name mlnx-nfsrdma-hwe} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-23%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -68,7 +68,7 @@ Summary: %{_name} Driver Name: mlnx-nfsrdma-hwe Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -85,9 +85,8 @@ BuildRequires: binutils BuildRequires: systemd BuildRequires: kmod BuildRequires: mlnx-ofa_kernel-hwe-devel = %{_mofed_full_version} -BuildRequires: mlnx-ofa_kernel-hwe-source = %{_mofed_full_version} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -251,6 +250,9 @@ fi %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe diff --git a/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec b/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec index 490df538d47..f8eca955e7d 100644 --- a/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec +++ b/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec @@ -41,7 +41,7 @@ %{!?_name: %define _name mlnx-nfsrdma} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-21%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -67,7 +67,7 @@ Summary: %{_name} Driver Name: mlnx-nfsrdma Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -250,6 +250,9 @@ fi %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS/mlnx-ofa_kernel-hwe/mlnx-ofa_kernel-hwe.spec b/SPECS/mlnx-ofa_kernel-hwe/mlnx-ofa_kernel-hwe.spec index 8325706f1d3..2f1dd0ec652 100644 --- a/SPECS/mlnx-ofa_kernel-hwe/mlnx-ofa_kernel-hwe.spec +++ b/SPECS/mlnx-ofa_kernel-hwe/mlnx-ofa_kernel-hwe.spec @@ -42,8 +42,6 @@ # KMP is disabled by default %{!?KMP: %global KMP 0} -%global WITH_SYSTEMD %(if ( test -d "%{_unitdir}" > /dev/null); then echo -n '1'; else echo -n '0'; fi) - %{!?configure_options: %global configure_options --with-core-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-mlx5-mod --with-mlxfw-mod --with-ipoib-mod} %global MEMTRACK %(if ( echo %{configure_options} | grep "with-memtrack" > /dev/null ); then echo -n '1'; else echo -n '0'; fi) @@ -79,11 +77,6 @@ # Select packages to build -# Kernel module packages to be included into kernel-ib -%global build_ipoib %(if ( echo %{configure_options} | grep "with-ipoib-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi) -%global build_oiscsi %(if ( echo %{configure_options} | grep "with-iscsi-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi) -%global build_mlx5 %(if ( echo %{configure_options} | grep "with-mlx5-mod" > /dev/null ); then echo -n '1'; else echo -n '0'; fi) - %{!?LIB_MOD_DIR: %global LIB_MOD_DIR /lib/modules/%{KVERSION}/updates} %{!?IB_CONF_DIR: %global IB_CONF_DIR /etc/infiniband} @@ -108,7 +101,7 @@ Summary: Infiniband HCA Driver Name: mlnx-ofa_kernel-hwe Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com/ Group: System Environment/Base @@ -139,21 +132,6 @@ BuildRequires: libstdc++-devel BuildRequires: libunwind-devel BuildRequires: pkgconfig -Requires: kernel-hwe = %{target_kernel_version_full} -Requires: kmod -Requires: libstdc++ -Requires: libunwind - -Requires: mlnx-tools >= 5.2.0 -Requires: coreutils -Requires: pciutils -Requires: grep -Requires: procps -Requires: module-init-tools -Requires: lsof -Requires: ofed-scripts -Conflicts: mlnx-ofa_kernel - %if "%{KMP}" == "1" BuildRequires: %kernel_module_package_buildreqs BuildRequires: /usr/bin/perl @@ -200,6 +178,21 @@ Obsoletes: mlnx-en-sources Obsoletes: mlnx-rdma-rxe Summary: Infiniband Driver and ULPs kernel modules Group: System Environment/Libraries + +Requires: kernel-hwe = %{target_kernel_version_full} +Requires: kmod +Requires: libstdc++ +Requires: libunwind + +Requires: mlnx-tools >= 5.2.0 +Requires: coreutils +Requires: pciutils +Requires: grep +Requires: procps +Requires: module-init-tools +Requires: lsof +Requires: ofed-scripts + %description -n %{non_kmp_pname} Core, HW and ULPs kernel modules Non-KMP format kernel modules rpm. @@ -229,16 +222,6 @@ Group: System Environment/Libraries Core, HW and ULPs kernel modules sources The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-ofa_kernel-24.10-0.7.0.tgz -%package source -Summary: Source of the MLNX_OFED main kernel driver -Group: System Environment/Libraries -%description source -Source of the mlnx-ofa_kernel modules. - -You should probably only install this package if you want to view the -sourecs of driver. Use the -devel package if you want to build other -drivers against it. - # # setup module sign scripts if paths to the keys are given # @@ -319,7 +302,6 @@ for flavor in %flavors_to_build; do find compat -type f -exec touch -t 200012201010 '{}' \; || true ./configure --build-dummy-mods --prefix=%{_prefix} --kernel-version $KVERSION --kernel-sources $KSRC --modules-dir $LIB_MOD_DIR $CONF_OPTIONS %{?_smp_mflags} make %{?_smp_mflags} kernel - make build_py_scripts cd - done @@ -336,8 +318,6 @@ for flavor in %flavors_to_build; do export KVERSION=%{kernel_release $KSRC} cd $PWD/obj/$flavor make install_modules KERNELRELEASE=$KVERSION - # install script and configuration files - make install_scripts mkdir -p %{_builddir}/src/$NAME/$flavor cp -ar include/ %{_builddir}/src/$NAME/$flavor cp -ar config* %{_builddir}/src/$NAME/$flavor @@ -378,105 +358,8 @@ done %endif %endif -# copy sources -mkdir -p %{buildroot}/%{_prefix}/src/ofa_kernel-%{version} -cp -a %{_builddir}/mlnx-ofa_kernel-%{version}/source %{buildroot}/%{_prefix}/src/ofa_kernel-%{version}/source -ln -s ofa_kernel-%{version}/source %{buildroot}/%{_prefix}/src/mlnx-ofa_kernel-%{version} # Fix path of BACKPORT_INCLUDES sed -i -e "s@=-I.*backport_includes@=-I/usr/src/ofa_kernel-$VERSION/backport_includes@" %{buildroot}/%{_prefix}/src/ofa_kernel/%{_arch}/%{KVERSION}/configure.mk.kernel || true -rm -rf %{_builddir}/src - -INFO=${RPM_BUILD_ROOT}/etc/infiniband/info -/bin/rm -f ${INFO} -mkdir -p ${RPM_BUILD_ROOT}/etc/infiniband -touch ${INFO} - -cat >> ${INFO} << EOFINFO -#!/bin/bash - -echo prefix=%{_prefix} -echo Kernel=%{KVERSION} -echo -echo "Configure options: %{configure_options}" -echo -EOFINFO - -chmod +x ${INFO} > /dev/null 2>&1 - -%if "%{WITH_SYSTEMD}" == "1" -install -d %{buildroot}%{_unitdir} -install -d %{buildroot}/etc/systemd/system -install -m 0644 %{_builddir}/%{base_name}-$VERSION/source/ofed_scripts/openibd.service %{buildroot}%{_unitdir} -install -m 0644 %{_builddir}/%{base_name}-$VERSION/source/ofed_scripts/mlnx_interface_mgr\@.service %{buildroot}/etc/systemd/system -%endif - -install -d %{buildroot}/bin -install -m 0755 %{_builddir}/%{base_name}-$VERSION/source/ofed_scripts/mlnx_conf_mgr.sh %{buildroot}/bin/ -%if "%{WINDRIVER}" == "0" && "%{BLUENIX}" == "0" -install -m 0755 %{_builddir}/%{base_name}-$VERSION/source/ofed_scripts/mlnx_interface_mgr.sh %{buildroot}/bin/ -%else -# Wind River and Mellanox Bluenix are rpm based, however, interfaces management is done in Debian style -install -d %{buildroot}/usr/sbin -install -m 0755 %{_builddir}/%{base_name}-$VERSION/source/ofed_scripts/mlnx_interface_mgr_deb.sh %{buildroot}/bin/mlnx_interface_mgr.sh -install -m 0755 %{_builddir}/%{base_name}-$VERSION/source/ofed_scripts/net-interfaces %{buildroot}/usr/sbin -%endif - -# Install ibroute utilities -# TBD: move these utilities into standalone package -install -d %{buildroot}%{_sbindir} - -# update /etc/init.d/openibd header -is_euler=`grep 'NAME=".*Euler' /etc/os-release 2>/dev/null || :` -if [[ -f /etc/redhat-release || -f /etc/rocks-release || "$is_euler" != '' ]]; then -perl -i -ne 'if (m@^#!/bin/bash@) { - print q@#!/bin/bash -# -# Bring up/down openib -# -# chkconfig: 2345 05 95 -# description: Activates/Deactivates InfiniBand Driver to \ -# start at boot time. -# -### BEGIN INIT INFO -# Provides: openibd -### END INIT INFO -@; - } else { - print; - }' %{buildroot}/etc/init.d/openibd -fi - -if grep -qwE 'suse|SLES' /etc/os-release 2>/dev/null; then - local_fs='$local_fs' - openiscsi='' - %if %{build_oiscsi} - openiscsi='open-iscsi' - %endif - perl -i -ne "if (m@^#!/bin/bash@) { - print q@#!/bin/bash -### BEGIN INIT INFO -# Provides: openibd -# Required-Start: $local_fs -# Required-Stop: opensmd $openiscsi -# Default-Start: 2 3 5 -# Default-Stop: 0 1 2 6 -# Description: Activates/Deactivates InfiniBand Driver to \ -# start at boot time. -### END INIT INFO -@; - } else { - print; - }" %{buildroot}/etc/init.d/openibd -fi - -%if %{build_ipoib} -case $(uname -m) in - i[3-6]86) - # Decrease send/receive queue sizes on 32-bit arcitecture - echo "options ib_ipoib send_queue_size=64 recv_queue_size=128" >> %{buildroot}/etc/modprobe.d/ib_ipoib.conf - ;; -esac -%endif %clean rm -rf %{buildroot} @@ -502,144 +385,6 @@ if [ $1 = 0 ]; then # 1 : Erase, not upgrade fi %endif # end KMP=1 -%post -n %{utils_pname} -if [ $1 -eq 1 ]; then # 1 : This package is being installed -############################################################################################################# -is_euler=`grep 'NAME=".*Euler' /etc/os-release 2>/dev/null || :` -is_kylin=`grep 'NAME=".*Kylin' /etc/os-release 2>/dev/null || :` -if [[ -f /etc/redhat-release || -f /etc/rocks-release || -f /etc/UnionTech-release || -f /etc/ctyunos-release || "$is_euler" != '' || "$is_kylin" != '' ]]; then - /sbin/chkconfig openibd off >/dev/null 2>&1 || true - /usr/bin/systemctl disable openibd >/dev/null 2>&1 || true - /sbin/chkconfig --del openibd >/dev/null 2>&1 || true - -%if "%{WITH_SYSTEMD}" != "1" - /sbin/chkconfig --add openibd >/dev/null 2>&1 || true - /sbin/chkconfig openibd on >/dev/null 2>&1 || true -%else - /usr/bin/systemctl enable openibd >/dev/null 2>&1 || true -%endif -fi - -if grep -qwE 'suse|SLES' /etc/os-release 2>/dev/null; then - /sbin/chkconfig openibd off >/dev/null 2>&1 || true - /usr/bin/systemctl disable openibd >/dev/null 2>&1 || true - /sbin/insserv -r openibd >/dev/null 2>&1 || true - -%if "%{WITH_SYSTEMD}" != "1" - /sbin/insserv openibd >/dev/null 2>&1 || true - /sbin/chkconfig openibd on >/dev/null 2>&1 || true -%else - /usr/bin/systemctl enable openibd >/dev/null 2>&1 || true -%endif -fi - -%if "%{WINDRIVER}" == "1" || "%{BLUENIX}" == "1" -/usr/sbin/update-rc.d openibd defaults || true -%endif - -%if "%{POWERKVM}" == "1" -/usr/bin/systemctl disable openibd >/dev/null 2>&1 || true -/usr/bin/systemctl enable openibd >/dev/null 2>&1 || true -%endif - -%if "%{WITH_SYSTEMD}" == "1" -/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : -cat /proc/sys/kernel/random/boot_id 2>/dev/null | sed -e 's/-//g' > /var/run/openibd.bootid || true -test -s /var/run/openibd.bootid || echo manual > /var/run/openibd.bootid || true -%endif - -# Comment core modules loading hack -if [ -e /etc/modprobe.conf.dist ]; then - sed -i -r -e 's/^(\s*install ib_core.*)/#MLX# \1/' /etc/modprobe.conf.dist - sed -i -r -e 's/^(\s*alias ib.*)/#MLX# \1/' /etc/modprobe.conf.dist -fi - -%if %{build_ipoib} -if [ -e /etc/modprobe.d/ipv6 ]; then - sed -i -r -e 's/^(\s*install ipv6.*)/#MLX# \1/' /etc/modprobe.d/ipv6 -fi -%endif - -# Update limits.conf (but not for Containers) -if [ ! -e "/.dockerenv" ] && ! (grep -q docker /proc/self/cgroup 2>/dev/null); then - if [ -e /etc/security/limits.conf ]; then - LIMITS_UPDATED=0 - if ! (grep -qE "soft.*memlock" /etc/security/limits.conf 2>/dev/null); then - echo "* soft memlock unlimited" >> /etc/security/limits.conf - LIMITS_UPDATED=1 - fi - if ! (grep -qE "hard.*memlock" /etc/security/limits.conf 2>/dev/null); then - echo "* hard memlock unlimited" >> /etc/security/limits.conf - LIMITS_UPDATED=1 - fi - if [ $LIMITS_UPDATED -eq 1 ]; then - echo "Configured /etc/security/limits.conf" - fi - fi -fi - -# Make IPoIB interfaces be unmanaged on XenServer -if (grep -qi xenserver /etc/issue /etc/*-release 2>/dev/null); then - IPOIB_PNUM=$(lspci -d 15b3: 2>/dev/null | wc -l 2>/dev/null) - IPOIB_PNUM=$(($IPOIB_PNUM * 2)) - for i in $(seq 1 $IPOIB_PNUM) - do - uuid=$(xe pif-list 2>/dev/null | grep -B2 ib${i} | grep uuid | cut -d : -f 2 | sed -e 's/ //g') - if [ "X${uuid}" != "X" ]; then - xe pif-forget uuid=${uuid} >/dev/null 2>&1 || true - fi - done -fi - -fi # 1 : closed -# END of post - -%preun -n %{utils_pname} -is_euler=`grep 'NAME=".*Euler' /etc/os-release 2>/dev/null || :` -is_kylin=`grep 'NAME=".*Kylin' /etc/os-release 2>/dev/null || :` -if [ $1 = 0 ]; then # 1 : Erase, not upgrade - if [[ -f /etc/redhat-release || -f /etc/rocks-release || -f /etc/UnionTech-release || "$is_euler" != '' || "$is_kylin" != '' ]]; then - /sbin/chkconfig openibd off >/dev/null 2>&1 || true - /usr/bin/systemctl disable openibd >/dev/null 2>&1 || true - /sbin/chkconfig --del openibd >/dev/null 2>&1 || true - fi - if grep -qwE 'suse|SLES' /etc/os-release 2>/dev/null; then - /sbin/chkconfig openibd off >/dev/null 2>&1 || true - /usr/bin/systemctl disable openibd >/dev/null 2>&1 || true - /sbin/insserv -r openibd >/dev/null 2>&1 || true - fi - if [ -f /etc/debian_version ]; then - if ! ( /usr/sbin/update-rc.d openibd remove > /dev/null 2>&1 ); then - true - fi - fi -%if "%{WINDRIVER}" == "1" || "%{BLUENIX}" == "1" -/usr/sbin/update-rc.d -f openibd remove || true -%endif - -%if "%{POWERKVM}" == "1" -/usr/bin/systemctl disable openibd >/dev/null 2>&1 || true -%endif -fi - -%postun -n %{utils_pname} -%if "%{WITH_SYSTEMD}" == "1" -/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : -%endif - -# Uncomment core modules loading hack -if [ -e /etc/modprobe.conf.dist ]; then - sed -i -r -e 's/^#MLX# (.*)/\1/' /etc/modprobe.conf.dist -fi - -%if %{build_ipoib} -if [ -e /etc/modprobe.d/ipv6 ]; then - sed -i -r -e 's/^#MLX# (.*)/\1/' /etc/modprobe.d/ipv6 -fi -%endif - -#end of post uninstall - %post -n %{devel_pname} if [ -d "%{_prefix}/src/ofa_kernel/default" -a $1 -gt 1 ]; then touch %{_prefix}/src/ofa_kernel/%{_arch}/%{KVERSION}.missing_link @@ -681,44 +426,6 @@ update-alternatives --remove \ ofa_kernel_headers \ %{_prefix}/src/ofa_kernel/%{_arch}/%{KVERSION} \ -%files -n %{utils_pname} -%defattr(-,root,root,-) -%license source/debian/copyright -%doc source/ofed_scripts/82-net-setup-link.rules source/ofed_scripts/vf-net-link-name.sh -%if "%{KMP}" == "1" -%if %{IS_RHEL_VENDOR} -%endif # end rh -%endif # end KMP=1 -%dir /etc/infiniband -%config(noreplace) /etc/infiniband/openib.conf -%config(noreplace) /etc/infiniband/mlx5.conf -/etc/infiniband/info -/etc/init.d/openibd -%if "%{WITH_SYSTEMD}" == "1" -%{_unitdir}/openibd.service -/etc/systemd/system/mlnx_interface_mgr@.service -%endif -/lib/udev/sf-rep-netdev-rename -/lib/udev/auxdev-sf-netdev-rename -/usr/sbin/setup_mr_cache.sh -%_datadir/mlnx_ofed/mlnx_bf_assign_ct_cores.sh -%config(noreplace) /etc/modprobe.d/mlnx.conf -%config(noreplace) /etc/modprobe.d/mlnx-bf.conf -%{_sbindir}/* -/lib/udev/rules.d/83-mlnx-sf-name.rules -/lib/udev/rules.d/90-ib.rules -/bin/mlnx_interface_mgr.sh -/bin/mlnx_conf_mgr.sh -%if "%{WINDRIVER}" == "1" || "%{BLUENIX}" == "1" -/usr/sbin/net-interfaces -%endif -%if %{build_ipoib} -%config(noreplace) /etc/modprobe.d/ib_ipoib.conf -%endif -%if %{build_mlx5} -%{_sbindir}/ibdev2netdev -%endif - %if "%{KMP}" != "1" %files -n %{non_kmp_pname} %license source/debian/copyright @@ -735,13 +442,10 @@ update-alternatives --remove \ %license source/debian/copyright %{_prefix}/src/ofa_kernel/%{_arch}/[0-9]* -%files source -%defattr(-,root,root,-) -%license source/debian/copyright -%{_prefix}/src/ofa_kernel-%version/source -%{_prefix}/src/mlnx-ofa_kernel-%version - %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe diff --git a/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec index 833450994ce..f8346325c15 100644 --- a/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec +++ b/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec @@ -106,7 +106,7 @@ Summary: Infiniband HCA Driver Name: mlnx-ofa_kernel Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com/ Group: System Environment/Base @@ -116,7 +116,6 @@ Patch0: 001-fix-module-init-for-ibt.patch BuildRoot: /var/tmp/%{name}-%{version}-build Vendor: Microsoft Corporation Distribution: Azure Linux -ExclusiveArch: x86_64 Obsoletes: kernel-ib Obsoletes: mlnx-en @@ -138,7 +137,6 @@ BuildRequires: libstdc++-devel BuildRequires: libunwind-devel BuildRequires: pkgconfig -Requires: kernel = %{target_kernel_version_full} Requires: kmod Requires: libstdc++ Requires: libunwind @@ -184,6 +182,8 @@ EOF) %global kernel_source() %{K_SRC} %global kernel_release() %{KVERSION} %global flavors_to_build default +# We create the module package only for the x86_64 kernel +%ifarch x86_64 %package -n %{non_kmp_pname} Obsoletes: kernel-ib Obsoletes: mlnx-en @@ -199,10 +199,14 @@ Obsoletes: mlnx-en-sources Obsoletes: mlnx-rdma-rxe Summary: Infiniband Driver and ULPs kernel modules Group: System Environment/Libraries + +Requires: kernel = %{target_kernel_version_full} + %description -n %{non_kmp_pname} Core, HW and ULPs kernel modules Non-KMP format kernel modules rpm. The driver sources are located at: http://www.mellanox.com/downloads/ofed/mlnx-ofa_kernel-24.10-0.7.0.tgz +%endif %endif #end if "%{KMP}" == "1" %package -n %{devel_pname} @@ -334,7 +338,13 @@ for flavor in %flavors_to_build; do export KSRC=%{kernel_source $flavor} export KVERSION=%{kernel_release $KSRC} cd $PWD/obj/$flavor +# For the default kernel, we create the module package only for the x86_64 kernel. +# Some other kernels (kernel-hwe for instance) get aarch64 modules packages built from other specs. +# We keep the user space packages like the module configs built only in this spec, though, +# and re-use them for kernel modules built for other kernel flavours and architectures. +%ifarch x86_64 make install_modules KERNELRELEASE=$KVERSION +%endif # install script and configuration files make install_scripts mkdir -p %{_builddir}/src/$NAME/$flavor @@ -354,11 +364,14 @@ for flavor in %flavors_to_build; do cp ./Module.symvers %{_builddir}/src/$NAME/$flavor/Module.symvers fi cp -a %{_builddir}/src/$NAME/$flavor %{buildroot}/%{_prefix}/src/ofa_kernel/%{_arch}/$KVERSION - # Cleanup unnecessary kernel-generated module dependency files. - find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*' -exec rm {} \; cd - done +%ifarch x86_64 + # Cleanup unnecessary kernel-generated module dependency files. + find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*' -exec rm {} \; +%endif + # Set the module(s) to be executable, so that they will be stripped when packaged. find %{buildroot} \( -type f -name '*.ko' -o -name '*ko.gz' \) -exec %{__chmod} u+x \{\} \; @@ -482,6 +495,7 @@ rm -rf %{buildroot} %if "%{KMP}" != "1" +%ifarch x86_64 %post -n %{non_kmp_pname} /sbin/depmod %{KVERSION} # W/A for OEL6.7/7.x inbox modules get locked in memory @@ -499,6 +513,7 @@ if [ $1 = 0 ]; then # 1 : Erase, not upgrade /sbin/dracut --force fi fi +%endif %endif # end KMP=1 %post -n %{utils_pname} @@ -719,6 +734,8 @@ update-alternatives --remove \ %endif %if "%{KMP}" != "1" +# We create the module package only for the x86_64 kernel +%ifarch x86_64 %files -n %{non_kmp_pname} %license source/debian/copyright /lib/modules/%{KVERSION}/%{install_mod_dir}/ @@ -728,6 +745,7 @@ update-alternatives --remove \ %endif %endif %endif +%endif %files -n %{devel_pname} %defattr(-,root,root,-) @@ -741,6 +759,9 @@ update-alternatives --remove \ %{_prefix}/src/mlnx-ofa_kernel-%version %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Adjusted package dependencies on user space components. + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS/srp-hwe/srp-hwe.spec b/SPECS/srp-hwe/srp-hwe.spec index 1d2e65cfe7e..50f69d76518 100644 --- a/SPECS/srp-hwe/srp-hwe.spec +++ b/SPECS/srp-hwe/srp-hwe.spec @@ -41,7 +41,7 @@ %{!?_name: %define _name srp-hwe} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-23%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -67,7 +67,7 @@ Summary: srp driver Name: srp-hwe Version: 24.10 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -85,9 +85,8 @@ BuildRequires: systemd BuildRequires: kmod BuildRequires: libconfig-devel BuildRequires: mlnx-ofa_kernel-hwe-devel = %{_mofed_full_version} -BuildRequires: mlnx-ofa_kernel-hwe-source = %{_mofed_full_version} -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} +Requires: mlnx-ofa_kernel Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} Requires: kernel-hwe = %{target_kernel_version_full} Requires: kmod @@ -256,6 +255,9 @@ fi %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. + * Fri Oct 06 2025 Siddharth Chintamaneni - 24.10-22_6.12.50.2-1 - Bump to match kernel-hwe diff --git a/SPECS/srp/srp.spec b/SPECS/srp/srp.spec index a9131087488..69fcc6496ab 100644 --- a/SPECS/srp/srp.spec +++ b/SPECS/srp/srp.spec @@ -40,7 +40,7 @@ %{!?_name: %define _name srp} %{!?_version: %define _version 24.10} -%{!?_mofed_full_version: %define _mofed_full_version %{_version}-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version %{_version}-21%{release_suffix}%{?dist}} %{!?_release: %define _release OFED.24.10.0.6.7.1} # KMP is disabled by default @@ -66,7 +66,7 @@ Summary: srp driver Name: srp Version: 24.10 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 Url: http://www.mellanox.com Group: System Environment/Base @@ -255,6 +255,9 @@ fi %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 24.10-21 +- Bump mofed release number + * Thu May 29 2025 Nicolas Guibourge - 24.10-20 - Add kernel version and release nb into release nb diff --git a/SPECS/xpmem-hwe/xpmem-hwe.spec b/SPECS/xpmem-hwe/xpmem-hwe.spec index c60d90bee69..9586c9ae64d 100644 --- a/SPECS/xpmem-hwe/xpmem-hwe.spec +++ b/SPECS/xpmem-hwe/xpmem-hwe.spec @@ -13,7 +13,7 @@ %global KVERSION %{target_kernel_version_full} %global K_SRC /lib/modules/%{target_kernel_version_full}/build -%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}} # %{!?KVERSION: %global KVERSION %(uname -r)} %{!?KVERSION: %global KVERSION %{target_kernel_version_full}} @@ -24,7 +24,7 @@ # script append_number_to_package_release.sh works: %global _release 1.2410068 -%bcond_with kernel_only +%bcond_without kernel_only %if %{with kernel_only} %undefine _debugsource_packages @@ -43,7 +43,7 @@ Summary: Cross-partition memory Name: xpmem-hwe Version: 2.7.4 -Release: 22%{release_suffix}%{?dist} +Release: 23%{release_suffix}%{?dist} License: GPLv2 and LGPLv2.1 Group: System Environment/Libraries Vendor: Microsoft Corporation @@ -51,7 +51,6 @@ Distribution: Azure Linux BuildRequires: automake autoconf URL: https://github.com/openucx/xpmem Source0: https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/xpmem-2.7.4.tar.gz#/xpmem-%{version}.tar.gz -ExclusiveArch: aarch64 # name gets a different value in subpackages %global kernel_suffix hwe @@ -76,14 +75,6 @@ BuildRequires: binutils BuildRequires: systemd BuildRequires: kmod BuildRequires: mlnx-ofa_kernel-hwe-devel = %{_mofed_full_version} -BuildRequires: mlnx-ofa_kernel-hwe-source = %{_mofed_full_version} - -Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version} -Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} -Requires: kernel-hwe = %{target_kernel_version_full} -Requires: kmod -Conflicts: xpmem - %description XPMEM is a Linux kernel module that enables a process to map the @@ -93,27 +84,6 @@ repository or by downloading a tarball from the link above. This package includes helper tools for the kernel module. -%if ! %{with kernel_only} -%package -n libxpmem-%{kernel_suffix} -Summary: XPMEM: Userspace library -%description -n libxpmem-%{kernel_suffix} -XPMEM is a Linux kernel module that enables a process to map the -memory of another process into its virtual address space. Source code -can be obtained by cloning the Git repository, original Mercurial -repository or by downloading a tarball from the link above. - - -%package -n libxpmem-%{kernel_suffix}-devel -Summary: XPMEM: userspace library development headers -%description -n libxpmem-%{kernel_suffix}-devel -XPMEM is a Linux kernel module that enables a process to map the -memory of another process into its virtual address space. Source code -can be obtained by cloning the Git repository, original Mercurial -repository or by downloading a tarball from the link above. - -This package includes development headers. -%endif - # build KMP rpms? %if "%{KMP}" == "1" %global kernel_release() $(make -C %{1} M=$PWD kernelrelease | grep -v make) @@ -131,6 +101,13 @@ EOF) # munge the release version here as well: Summary: XPMEM: kernel modules Group: System Environment/Libraries +ExclusiveArch: aarch64 + +Requires: mlnx-ofa_kernel +Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version} +Requires: kernel-hwe = %{target_kernel_version_full} +Requires: kmod + %description modules XPMEM is a Linux kernel module that enables a process to map the memory of another process into its virtual address space. Source code @@ -197,10 +174,12 @@ fi %{make_install} moduledir=%{moduledir} %{make_kernel_only} rm -rf $RPM_BUILD_ROOT/%{_libdir}/libxpmem.la rm -rf $RPM_BUILD_ROOT/etc/init.d/xpmem -mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modules-load.d -echo "xpmem" >$RPM_BUILD_ROOT%{_prefix}/lib/modules-load.d/xpmem.conf %if %{with kernel_only} +rm -rf $RPM_BUILD_ROOT/lib/udev/rules.d rm -f $RPM_BUILD_ROOT/usr/lib*/pkgconfig/cray-xpmem.pc +%else +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modules-load.d +echo "xpmem" >$RPM_BUILD_ROOT%{_prefix}/lib/modules-load.d/xpmem.conf %endif %if %{need_firmware_dir} mkdir -p $RPM_BUILD_ROOT/lib/firmware @@ -209,52 +188,25 @@ mkdir -p $RPM_BUILD_ROOT/lib/firmware %clean rm -rf $RPM_BUILD_ROOT +%if "%{KMP}" != "1" %post modules -depmod %{KVERSION} -a -/sbin/modprobe -r xpmem > /dev/null 2>&1 -/sbin/modprobe xpmem > /dev/null 2>&1 - -%if ! %{with kernel_only} -%post -n libxpmem-%{kernel_suffix} -p /sbin/ldconfig -%postun -n libxpmem-%{kernel_suffix} -p /sbin/ldconfig -%endif +depmod %{KVERSION} %postun modules -if [ "$1" = 0 ]; then - if lsmod | grep -qw xpmem; then - # If the module fails to unload, give an error, - # but don't fail uninstall. User should handle this - # Maybe the module is in use - rmmod xpmem || : - fi +if [ $1 = 0 ]; then # 1 : Erase, not upgrade + /sbin/depmod %{KVERSION} fi -%files -/lib/udev/rules.d/*-xpmem.rules -%{_prefix}/lib/modules-load.d/xpmem.conf -%doc README AUTHORS -%license COPYING COPYING.LESSER - -%if ! %{with kernel_only} -%files -n libxpmem-%{kernel_suffix} -%{_libdir}/libxpmem.so.* -%license COPYING COPYING.LESSER - -%files -n libxpmem-%{kernel_suffix}-devel -%{_prefix}/include/xpmem.h -%{_libdir}/libxpmem.a -%{_libdir}/libxpmem.so -%{_libdir}/pkgconfig/cray-xpmem.pc -%license COPYING COPYING.LESSER -%endif - -%if "%{KMP}" != "1" %files modules %{moduledir}/xpmem.ko %license COPYING COPYING.LESSER %endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 2.7.4-23_6.12.50.2-1 +- Adjusted package dependencies on user space components. +- Align %%post* scripts with other kmod packages. + * Fri Oct 03 2025 Siddharth Chintamaneni - 2.7.4-22_6.12.50.2-1 - Bump to match kernel-hwe diff --git a/SPECS/xpmem/xpmem.spec b/SPECS/xpmem/xpmem.spec index bee678d3412..15d7f4e303c 100644 --- a/SPECS/xpmem/xpmem.spec +++ b/SPECS/xpmem/xpmem.spec @@ -12,7 +12,7 @@ %global KVERSION %{target_kernel_version_full} %global K_SRC /lib/modules/%{target_kernel_version_full}/build -%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}} +%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}} # %{!?KVERSION: %global KVERSION %(uname -r)} %{!?KVERSION: %global KVERSION %{target_kernel_version_full}} @@ -42,7 +42,7 @@ Summary: Cross-partition memory Name: xpmem Version: 2.7.4 -Release: 20%{release_suffix}%{?dist} +Release: 21%{release_suffix}%{?dist} License: GPLv2 and LGPLv2.1 Group: System Environment/Libraries Vendor: Microsoft Corporation @@ -50,7 +50,6 @@ Distribution: Azure Linux BuildRequires: automake autoconf URL: https://github.com/openucx/xpmem Source0: https://linux.mellanox.com/public/repo/mlnx_ofed/24.10-0.7.0.0/SRPMS/xpmem-2.7.4.tar.gz#/%{name}-%{version}.tar.gz -ExclusiveArch: x86_64 # name gets a different value in subpackages %global _name %{name} @@ -79,9 +78,6 @@ BuildRequires: mlnx-ofa_kernel-devel = %{_mofed_full_version} BuildRequires: mlnx-ofa_kernel-source = %{_mofed_full_version} Requires: mlnx-ofa_kernel = %{_mofed_full_version} -Requires: mlnx-ofa_kernel-modules = %{_mofed_full_version} -Requires: kernel = %{target_kernel_version_full} -Requires: kmod %description @@ -125,11 +121,18 @@ EOF) %global kernel_release() %{KVERSION} %global flavors_to_build default +# We create the module package only for the x86_64 kernel +%ifarch x86_64 %package modules # %{nil}: to avoid having the script that build OFED-internal # munge the release version here as well: Summary: XPMEM: kernel modules Group: System Environment/Libraries + +Requires: mlnx-ofa_kernel-modules = %{_mofed_full_version} +Requires: kernel = %{target_kernel_version_full} +Requires: kmod + %description modules XPMEM is a Linux kernel module that enables a process to map the memory of another process into its virtual address space. Source code @@ -137,6 +140,7 @@ can be obtained by cloning the Git repository, original Mercurial repository or by downloading a tarball from the link above. This package includes the kernel module (non KMP version). +%endif %endif #end if "%{KMP}" == "1" # @@ -194,6 +198,13 @@ fi %install %{make_install} moduledir=%{moduledir} %{make_kernel_only} +# For the default kernel, we create the module package only for the x86_64 kernel. +# Some other kernels (kernel-hwe for instance) get aarch64 modules packages built from other specs. +# We keep the user space packages like the module configs built only in this spec, though, +# and re-use them for kernel modules built for other kernel flavours and architectures. +%ifnarch x86_64 +rm -rf $RPM_BUILD_ROOT/%{moduledir} +%endif rm -rf $RPM_BUILD_ROOT/%{_libdir}/libxpmem.la rm -rf $RPM_BUILD_ROOT/etc/init.d/xpmem mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modules-load.d @@ -243,12 +254,27 @@ fi %endif %if "%{KMP}" != "1" +# We create the module package only for the x86_64 kernel +%ifarch x86_64 +%post modules +/sbin/depmod %{KVERSION} + +%postun modules +if [ $1 = 0 ]; then # 1 : Erase, not upgrade + /sbin/depmod %{KVERSION} +fi + %files modules %{moduledir}/xpmem.ko %license COPYING COPYING.LESSER %endif +%endif %changelog +* Fri Oct 10 2025 Pawel Winogrodzki - 2.7.4-21 +- Adjusted package dependencies on user space components. +- Align %%post* scripts with other kmod packages. + * Thu May 29 2025 Nicolas Guibourge - 2.7.4-20 - Add kernel version and release nb into release nb