From 545d5b713b0fbb9080a94bb51d4f4ae30d3221be Mon Sep 17 00:00:00 2001 From: Binu Jose Philip Date: Sat, 18 Jan 2025 08:24:04 +0000 Subject: [PATCH 1/4] mofed and deps signed spec cleanup --- SPECS-SIGNED/fwctl-signed/fwctl-signed.spec | 8 +++- SPECS-SIGNED/iser-signed/iser-signed.spec | 8 +++- SPECS-SIGNED/isert-signed/isert-signed.spec | 9 ++-- .../knem-signed/knem-modules-signed.spec | 8 +--- .../mlnx-nfsrdma-signed.spec | 9 ++-- .../mlnx-ofa_kernel-modules-signed.spec | 42 ++++++++++--------- SPECS-SIGNED/srp-signed/srp-signed.spec | 11 +++-- .../xpmem-signed/xpmem-modules-signed.spec | 4 +- 8 files changed, 59 insertions(+), 40 deletions(-) diff --git a/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec b/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec index 9d3f6d9a7a1..0694a78835e 100644 --- a/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec +++ b/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec @@ -36,6 +36,8 @@ %global KVERSION %{target_kernel_version_full} +%define mlnx_version 24.10 + %{!?_name: %define _name fwctl} Summary: %{_name} Driver @@ -61,8 +63,8 @@ Vendor: Microsoft Corporation Distribution: Azure Linux ExclusiveArch: x86_64 -Requires: mlnx-ofa_kernel = %{_version} -Requires: mlnx-ofa_kernel-modules = %{_version} +Requires: mlnx-ofa_kernel = %{mlnx_version} +Requires: mlnx-ofa_kernel-modules = %{mlnx_version} Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -99,6 +101,8 @@ fi # 1 : closed %changelog +* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 +- define mlnx_ofa_version macro * Tue Dec 16 2024 Binu Jose Philip - 24.10.0.6.7.1 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) diff --git a/SPECS-SIGNED/iser-signed/iser-signed.spec b/SPECS-SIGNED/iser-signed/iser-signed.spec index 3879e6d8aa1..704d619d430 100644 --- a/SPECS-SIGNED/iser-signed/iser-signed.spec +++ b/SPECS-SIGNED/iser-signed/iser-signed.spec @@ -32,6 +32,8 @@ %global KVERSION %{target_kernel_version_full} +%define mlnx_version 24.10 + %{!?_name: %define _name iser} Summary: %{_name} Driver @@ -56,8 +58,8 @@ Vendor: Microsoft Corporation Distribution: Azure Linux ExclusiveArch: x86_64 -Requires: mlnx-ofa_kernel = %{_version} -Requires: mlnx-ofa_kernel-modules = %{_version} +Requires: mlnx-ofa_kernel = %{mlnx_version} +Requires: mlnx-ofa_kernel-modules = %{mlnx_version} Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -94,6 +96,8 @@ fi # 1 : closed %changelog +* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 +- define mlnx_ofa_version macro * Tue Dec 16 2024 Binu Jose Philip - 24.10.0.6.7.1 - Creating signed spec - License verified diff --git a/SPECS-SIGNED/isert-signed/isert-signed.spec b/SPECS-SIGNED/isert-signed/isert-signed.spec index a52b4481a6c..9588971ec3e 100644 --- a/SPECS-SIGNED/isert-signed/isert-signed.spec +++ b/SPECS-SIGNED/isert-signed/isert-signed.spec @@ -32,6 +32,8 @@ %global KVERSION %{target_kernel_version_full} +%define mlnx_version 24.10 + %{!?_name: %define _name isert} Summary: %{_name} Driver @@ -56,8 +58,8 @@ Vendor: Microsoft Corporation Distribution: Azure Linux ExclusiveArch: x86_64 -Requires: mlnx-ofa_kernel = %{_version} -Requires: mlnx-ofa_kernel-modules = %{_version} +Requires: mlnx-ofa_kernel = %{mlnx_version} +Requires: mlnx-ofa_kernel-modules = %{mlnx_version} Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -68,7 +70,6 @@ isert signed kernel modules %build - %install rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot} @@ -94,6 +95,8 @@ fi # 1 : closed %changelog +* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 +- define mlnx_ofa_version macro * Tue Dec 16 2024 Binu Jose Philip - 24.10.0.6.7.1 - Creating signed spec - License verified diff --git a/SPECS-SIGNED/knem-signed/knem-modules-signed.spec b/SPECS-SIGNED/knem-signed/knem-modules-signed.spec index c4df6592bc0..d5ed83583f2 100644 --- a/SPECS-SIGNED/knem-signed/knem-modules-signed.spec +++ b/SPECS-SIGNED/knem-signed/knem-modules-signed.spec @@ -91,14 +91,10 @@ fi %files %{_datadir}/licenses /lib/modules/ -%if %{IS_RHEL_VENDOR} -%if ! 0%{?fedora} -%config(noreplace) %{_sysconfdir}/depmod.d/%{_name}.conf -%endif -%endif - %changelog +* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 +- define mlnx_ofa_version macro and remove invalid distro conditional * Tue Dec 16 2024 Binu Jose Philip - 1.1.4.90mlnx3 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) diff --git a/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec b/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec index 761c7eb34d7..f53cc66123b 100644 --- a/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec +++ b/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec @@ -32,6 +32,8 @@ %global KVERSION %{target_kernel_version_full} +%define mlnx_version 24.10 + %{!?_name: %define _name mlnx-nfsrdma} Summary: %{_name} Driver @@ -58,8 +60,8 @@ Vendor: Microsoft Corporation Distribution: Azure Linux ExclusiveArch: x86_64 -Requires: mlnx-ofa_kernel = %{_version} -Requires: mlnx-ofa_kernel-modules = %{_version} +Requires: mlnx-ofa_kernel = %{mlnx_version} +Requires: mlnx-ofa_kernel-modules = %{mlnx_version} Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -96,8 +98,9 @@ fi /lib/modules/%{KVERSION}/updates/ %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf - %changelog +* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 +- define mlnx_ofa_version macro * Tue Dec 16 2024 Binu Jose Philip - 24.10.0.6.7.1 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) diff --git a/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec b/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec index ffa0bc558d5..5bd5dd10a41 100644 --- a/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec +++ b/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec @@ -72,16 +72,16 @@ Source16: ib_iser.ko Source17: ib_isert.ko Source18: ib_srp.ko Source19: mlx5_core.ko -Source10: mlxfw.ko -Source11: mlxsw_spectrum.ko -Source12: nvme-rdma.ko -Source13: nvmet-rdma.ko -Source14: mlxdevm.ko -Source15: smc.ko -Source16: smc_diag.ko -Source17: rpcrdma.ko -Source18: svcrdma.ko -Source19: xprtrdma.ko +Source20: mlxfw.ko +Source21: mlxsw_spectrum.ko +Source22: nvme-rdma.ko +Source23: nvmet-rdma.ko +Source24: mlxdevm.ko +Source25: smc.ko +Source26: smc_diag.ko +Source27: rpcrdma.ko +Source28: svcrdma.ko +Source29: xprtrdma.ko Vendor: Microsoft Corporation Distribution: Azure Linux @@ -144,16 +144,16 @@ cp -r %{SOURCE16} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniban cp -r %{SOURCE17} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/isert/ib_isert.ko cp -r %{SOURCE18} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/srp/ib_srp.ko cp -r %{SOURCE19} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko -cp -r %{SOURCE10} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxfw/mlxfw.ko -cp -r %{SOURCE11} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko -cp -r %{SOURCE12} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/host/nvme-rdma.ko -cp -r %{SOURCE13} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/target/nvmet-rdma.ko -cp -r %{SOURCE14} %{buildroot}/lib/modules/%{KVERSION}/updates/net/mlxdevm/mlxdevm.ko -cp -r %{SOURCE15} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc.ko -cp -r %{SOURCE16} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc_diag.ko -cp -r %{SOURCE17} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/rpcrdma.ko -cp -r %{SOURCE18} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/svcrdma.ko -cp -r %{SOURCE19} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/xprtrdma.ko +cp -r %{SOURCE20} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxfw/mlxfw.ko +cp -r %{SOURCE21} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko +cp -r %{SOURCE22} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/host/nvme-rdma.ko +cp -r %{SOURCE23} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/target/nvmet-rdma.ko +cp -r %{SOURCE24} %{buildroot}/lib/modules/%{KVERSION}/updates/net/mlxdevm/mlxdevm.ko +cp -r %{SOURCE25} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc.ko +cp -r %{SOURCE26} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc_diag.ko +cp -r %{SOURCE27} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/rpcrdma.ko +cp -r %{SOURCE28} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/svcrdma.ko +cp -r %{SOURCE29} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/xprtrdma.ko %clean rm -rf %{buildroot} @@ -171,6 +171,8 @@ fi %license %{_datadir}/licenses/%{name}/copyright %changelog +* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 +- duplicate SourceNN definitions * Tue Dec 16 2024 Binu Jose Philip - 24.10 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) diff --git a/SPECS-SIGNED/srp-signed/srp-signed.spec b/SPECS-SIGNED/srp-signed/srp-signed.spec index 21b993da44a..279048a4f38 100644 --- a/SPECS-SIGNED/srp-signed/srp-signed.spec +++ b/SPECS-SIGNED/srp-signed/srp-signed.spec @@ -32,6 +32,8 @@ %global target_kernel_version_full f.a.k.e %endif +%define mlnx_version 24.10 + %global KVERSION %{target_kernel_version_full} Summary: srp driver @@ -57,8 +59,8 @@ Vendor: Microsoft Corporation Distribution: Azure Linux ExclusiveArch: x86_64 -Requires: mlnx-ofa_kernel = %{_version} -Requires: mlnx-ofa_kernel-modules = %{_version} +Requires: mlnx-ofa_kernel = %{mlnx_version} +Requires: mlnx-ofa_kernel-modules = %{mlnx_version} Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -78,7 +80,7 @@ cp -r %{SOURCE2} %{buildroot}/lib/modules/%{KVERSION}/updates/srp/scsi/scsi_tran %clean rm -rf %{buildroot} -%files modules +%files %defattr(-,root,root,-) /lib/modules/%{KVERSION}/updates/srp/ib_srp.ko /lib/modules/%{KVERSION}/updates/srp/scsi/scsi_transport_srp.ko @@ -86,6 +88,9 @@ rm -rf %{buildroot} %license %{_datadir}/licenses/%{name}/copyright %changelog +* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 +- define mlnx_ofa_version macro +- wrong package name in files seciont * Thu Jan 9 2024 Binu Jose Philip - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) diff --git a/SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec b/SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec index 47f370d26b4..5d5fb571acc 100644 --- a/SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec +++ b/SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec @@ -57,12 +57,14 @@ cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/updates/xpmem.ko %clean rm -rf %{buildroot} -%files modules +%files /lib/modules/%{KVERSION}/updates/xpmem.ko %{_datadir}/licenses %changelog +* Sat Jan 18 2024 Binu Jose Philip - 2.7.4 +- wrong package name in files section * Tue Dec 16 2024 Binu Jose Philip - 2.7.4 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) From 483e4173b0690c1b32b2b3143e132273b536d4c1 Mon Sep 17 00:00:00 2001 From: Binu Jose Philip Date: Sat, 18 Jan 2025 17:56:38 +0000 Subject: [PATCH 2/4] changelog cleanup --- .../mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec | 2 +- SPECS-SIGNED/srp-signed/srp-signed.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec b/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec index 5bd5dd10a41..2ddc90f9696 100644 --- a/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec +++ b/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec @@ -171,7 +171,7 @@ fi %license %{_datadir}/licenses/%{name}/copyright %changelog -* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 +* Sat Jan 18 2025 Binu Jose Philip - 24.10 - duplicate SourceNN definitions * Tue Dec 16 2024 Binu Jose Philip - 24.10 - Creating signed spec diff --git a/SPECS-SIGNED/srp-signed/srp-signed.spec b/SPECS-SIGNED/srp-signed/srp-signed.spec index 279048a4f38..f246ecd669c 100644 --- a/SPECS-SIGNED/srp-signed/srp-signed.spec +++ b/SPECS-SIGNED/srp-signed/srp-signed.spec @@ -88,7 +88,7 @@ rm -rf %{buildroot} %license %{_datadir}/licenses/%{name}/copyright %changelog -* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 +* Sat Jan 18 2024 Binu Jose Philip - 24.10 - define mlnx_ofa_version macro - wrong package name in files seciont * Thu Jan 9 2024 Binu Jose Philip From a71237b32ed2c1555464787238a39f233225f009 Mon Sep 17 00:00:00 2001 From: Binu Jose Philip Date: Sat, 18 Jan 2025 21:22:37 +0000 Subject: [PATCH 3/4] changelog and version cleanup --- SPECS-SIGNED/fwctl-signed/fwctl-signed.spec | 10 +++------- SPECS-SIGNED/iser-signed/iser-signed.spec | 11 +++-------- SPECS-SIGNED/isert-signed/isert-signed.spec | 11 +++-------- SPECS-SIGNED/knem-signed/knem-modules-signed.spec | 4 +--- SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec | 2 +- .../mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec | 4 +--- .../mlnx-ofa_kernel-modules-signed.spec | 4 +--- SPECS-SIGNED/srp-signed/srp-signed.spec | 11 +++-------- SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec | 4 +--- 9 files changed, 17 insertions(+), 44 deletions(-) diff --git a/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec b/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec index 0694a78835e..8be7ad90a51 100644 --- a/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec +++ b/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec @@ -36,8 +36,6 @@ %global KVERSION %{target_kernel_version_full} -%define mlnx_version 24.10 - %{!?_name: %define _name fwctl} Summary: %{_name} Driver @@ -63,8 +61,8 @@ Vendor: Microsoft Corporation Distribution: Azure Linux ExclusiveArch: x86_64 -Requires: mlnx-ofa_kernel = %{mlnx_version} -Requires: mlnx-ofa_kernel-modules = %{mlnx_version} +Requires: mlnx-ofa_kernel = %{version} +Requires: mlnx-ofa_kernel-modules = %{version} Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -101,9 +99,7 @@ fi # 1 : closed %changelog -* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 -- define mlnx_ofa_version macro -* Tue Dec 16 2024 Binu Jose Philip - 24.10.0.6.7.1 +* Sat Jan 18 2024 Binu Jose Philip - 24.10-1 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified diff --git a/SPECS-SIGNED/iser-signed/iser-signed.spec b/SPECS-SIGNED/iser-signed/iser-signed.spec index 704d619d430..bd62c365463 100644 --- a/SPECS-SIGNED/iser-signed/iser-signed.spec +++ b/SPECS-SIGNED/iser-signed/iser-signed.spec @@ -32,8 +32,6 @@ %global KVERSION %{target_kernel_version_full} -%define mlnx_version 24.10 - %{!?_name: %define _name iser} Summary: %{_name} Driver @@ -58,8 +56,8 @@ Vendor: Microsoft Corporation Distribution: Azure Linux ExclusiveArch: x86_64 -Requires: mlnx-ofa_kernel = %{mlnx_version} -Requires: mlnx-ofa_kernel-modules = %{mlnx_version} +Requires: mlnx-ofa_kernel = %{version} +Requires: mlnx-ofa_kernel-modules = %{version} Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -94,11 +92,8 @@ fi # 1 : closed /lib/modules/%{KVERSION}/updates/ %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf - %changelog -* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 -- define mlnx_ofa_version macro -* Tue Dec 16 2024 Binu Jose Philip - 24.10.0.6.7.1 +* Sat Jan 18 2024 Binu Jose Philip - 24.10-1 - Creating signed spec - License verified - Initial Azure Linux import from NVIDIA (license: GPLv2) diff --git a/SPECS-SIGNED/isert-signed/isert-signed.spec b/SPECS-SIGNED/isert-signed/isert-signed.spec index 9588971ec3e..e810ab3c124 100644 --- a/SPECS-SIGNED/isert-signed/isert-signed.spec +++ b/SPECS-SIGNED/isert-signed/isert-signed.spec @@ -32,8 +32,6 @@ %global KVERSION %{target_kernel_version_full} -%define mlnx_version 24.10 - %{!?_name: %define _name isert} Summary: %{_name} Driver @@ -58,8 +56,8 @@ Vendor: Microsoft Corporation Distribution: Azure Linux ExclusiveArch: x86_64 -Requires: mlnx-ofa_kernel = %{mlnx_version} -Requires: mlnx-ofa_kernel-modules = %{mlnx_version} +Requires: mlnx-ofa_kernel = %{version} +Requires: mlnx-ofa_kernel-modules = %{version} Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -93,11 +91,8 @@ fi # 1 : closed /lib/modules/%{KVERSION}/updates/ %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf - %changelog -* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 -- define mlnx_ofa_version macro -* Tue Dec 16 2024 Binu Jose Philip - 24.10.0.6.7.1 +* Sat Jan 18 2024 Binu Jose Philip - 24.10-1 - Creating signed spec - License verified - Initial Azure Linux import from NVIDIA (license: GPLv2) diff --git a/SPECS-SIGNED/knem-signed/knem-modules-signed.spec b/SPECS-SIGNED/knem-signed/knem-modules-signed.spec index d5ed83583f2..bcfaaf67b52 100644 --- a/SPECS-SIGNED/knem-signed/knem-modules-signed.spec +++ b/SPECS-SIGNED/knem-signed/knem-modules-signed.spec @@ -93,9 +93,7 @@ fi /lib/modules/ %changelog -* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 -- define mlnx_ofa_version macro and remove invalid distro conditional -* Tue Dec 16 2024 Binu Jose Philip - 1.1.4.90mlnx3 +* Sat Jan 18 2024 Binu Jose Philip - 1.1.4.90mlnx3-1 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified diff --git a/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec b/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec index cfdfbad1ddb..a9254413cc1 100644 --- a/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec +++ b/SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec @@ -62,7 +62,7 @@ rm -rf %{buildroot} /lib/modules/%{KVERSION}/updates/ %changelog -* Tue Dec 16 2024 Binu Jose Philip - 4.30.0 +* Tue Dec 16 2024 Binu Jose Philip - 4.30.0-1 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified diff --git a/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec b/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec index f53cc66123b..55cd3e60eb4 100644 --- a/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec +++ b/SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec @@ -99,9 +99,7 @@ fi %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf %changelog -* Sat Jan 18 2024 Binu Jose Philip - 24.10.0.6.7.1 -- define mlnx_ofa_version macro -* Tue Dec 16 2024 Binu Jose Philip - 24.10.0.6.7.1 +* Sat Jan 18 2024 Binu Jose Philip - 24.10-1 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified diff --git a/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec b/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec index 2ddc90f9696..a5ac9f759e1 100644 --- a/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec +++ b/SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec @@ -171,9 +171,7 @@ fi %license %{_datadir}/licenses/%{name}/copyright %changelog -* Sat Jan 18 2025 Binu Jose Philip - 24.10 -- duplicate SourceNN definitions -* Tue Dec 16 2024 Binu Jose Philip - 24.10 +* Sat Jan 18 2025 Binu Jose Philip - 24.10-1 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified diff --git a/SPECS-SIGNED/srp-signed/srp-signed.spec b/SPECS-SIGNED/srp-signed/srp-signed.spec index f246ecd669c..9b99efd2e10 100644 --- a/SPECS-SIGNED/srp-signed/srp-signed.spec +++ b/SPECS-SIGNED/srp-signed/srp-signed.spec @@ -32,8 +32,6 @@ %global target_kernel_version_full f.a.k.e %endif -%define mlnx_version 24.10 - %global KVERSION %{target_kernel_version_full} Summary: srp driver @@ -59,8 +57,8 @@ Vendor: Microsoft Corporation Distribution: Azure Linux ExclusiveArch: x86_64 -Requires: mlnx-ofa_kernel = %{mlnx_version} -Requires: mlnx-ofa_kernel-modules = %{mlnx_version} +Requires: mlnx-ofa_kernel = %{version} +Requires: mlnx-ofa_kernel-modules = %{version} Requires: kernel = %{target_kernel_version_full} Requires: kmod @@ -88,10 +86,7 @@ rm -rf %{buildroot} %license %{_datadir}/licenses/%{name}/copyright %changelog -* Sat Jan 18 2024 Binu Jose Philip - 24.10 -- define mlnx_ofa_version macro -- wrong package name in files seciont -* Thu Jan 9 2024 Binu Jose Philip +* Sat Jan 18 2024 Binu Jose Philip - 24.10-1 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified diff --git a/SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec b/SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec index 5d5fb571acc..a3ecc8163a7 100644 --- a/SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec +++ b/SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec @@ -63,9 +63,7 @@ rm -rf %{buildroot} %changelog -* Sat Jan 18 2024 Binu Jose Philip - 2.7.4 -- wrong package name in files section -* Tue Dec 16 2024 Binu Jose Philip - 2.7.4 +* Sat Jan 18 2024 Binu Jose Philip - 2.7.4-1 - Creating signed spec - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified From 131250825d76d420c55fe905afb7b304a379e9bf Mon Sep 17 00:00:00 2001 From: Binu Jose Philip Date: Sat, 18 Jan 2025 21:27:37 +0000 Subject: [PATCH 4/4] changelog and version cleanup for spec --- SPECS/fwctl/fwctl.spec | 2 +- SPECS/iser/iser.spec | 2 +- SPECS/isert/isert.spec | 2 +- SPECS/knem/knem.spec | 2 +- SPECS/mft_kernel/mft_kernel.spec | 2 +- SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec | 2 +- SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec | 2 +- SPECS/srp/srp.spec | 2 +- SPECS/xpmem/xpmem.spec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SPECS/fwctl/fwctl.spec b/SPECS/fwctl/fwctl.spec index c079bcb9458..ad190a3767d 100644 --- a/SPECS/fwctl/fwctl.spec +++ b/SPECS/fwctl/fwctl.spec @@ -250,7 +250,7 @@ fi # 1 : closed %endif %changelog -* Tue Dec 17 2024 Binu Jose Philip +* Tue Dec 17 2024 Binu Jose Philip - 24.10-1 - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified * Mon Jul 29 2024 diff --git a/SPECS/iser/iser.spec b/SPECS/iser/iser.spec index f1bfeaba193..4f40ee267ef 100644 --- a/SPECS/iser/iser.spec +++ b/SPECS/iser/iser.spec @@ -247,7 +247,7 @@ fi # 1 : closed %endif %changelog -* Tue Dec 17 2024 Binu Jose Philip +* Tue Dec 17 2024 Binu Jose Philip - 24.10-1 - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified * Thu Feb 20 2014 Alaa Hleihel diff --git a/SPECS/isert/isert.spec b/SPECS/isert/isert.spec index bb145a141d8..54e14b58afd 100644 --- a/SPECS/isert/isert.spec +++ b/SPECS/isert/isert.spec @@ -247,7 +247,7 @@ fi # 1 : closed %endif %changelog -* Tue Dec 17 2024 Binu Jose Philip +* Tue Dec 17 2024 Binu Jose Philip - 24.10-1 - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified * Thu Feb 20 2014 Alaa Hleihel diff --git a/SPECS/knem/knem.spec b/SPECS/knem/knem.spec index 6ef9e41d22f..d680b90b297 100644 --- a/SPECS/knem/knem.spec +++ b/SPECS/knem/knem.spec @@ -282,7 +282,7 @@ fi %endif %changelog -* Tue Dec 17 2024 Binu Jose Philip +* Tue Dec 17 2024 Binu Jose Philip - 1.1.4.90mlnx3-1 - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified * Mon Mar 17 2014 Alaa Hleihel diff --git a/SPECS/mft_kernel/mft_kernel.spec b/SPECS/mft_kernel/mft_kernel.spec index faaf2e0baaa..346d6b9f67a 100644 --- a/SPECS/mft_kernel/mft_kernel.spec +++ b/SPECS/mft_kernel/mft_kernel.spec @@ -230,6 +230,6 @@ find %{buildroot} -type f -name \*.ko -exec %{__strip} -p --strip-debug --discar %endif %changelog -* Tue Dec 17 2024 Binu Jose Philip +* Tue Dec 17 2024 Binu Jose Philip - 4.30.0-1 - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified diff --git a/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec b/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec index a16a4d06c6f..c83c2dc82ef 100644 --- a/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec +++ b/SPECS/mlnx-nfsrdma/mlnx-nfsrdma.spec @@ -248,7 +248,7 @@ fi %endif %changelog -* Tue Dec 17 2024 Binu Jose Philip +* Tue Dec 17 2024 Binu Jose Philip - 24.10-1 - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified * Mon Aug 15 2016 Alaa Hleihel diff --git a/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec b/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec index fa5b82eac1d..d9ced2b6297 100644 --- a/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec +++ b/SPECS/mlnx-ofa_kernel/mlnx-ofa_kernel.spec @@ -736,7 +736,7 @@ update-alternatives --remove \ %{_prefix}/src/mlnx-ofa_kernel-%version %changelog -* Tue Dec 17 2024 Binu Jose Philip +* Tue Dec 17 2024 Binu Jose Philip - 24.10-1 - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified * Thu Jun 18 2015 Alaa Hleihel diff --git a/SPECS/srp/srp.spec b/SPECS/srp/srp.spec index dd59aa8a5cc..68d02a2bd01 100644 --- a/SPECS/srp/srp.spec +++ b/SPECS/srp/srp.spec @@ -253,7 +253,7 @@ fi %endif %changelog -* Thu Jan 9 2024 Binu Jose Philip +* Thu Jan 9 2024 Binu Jose Philip - 24.10-1 - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified * Thu Feb 20 2014 Alaa Hleihel diff --git a/SPECS/xpmem/xpmem.spec b/SPECS/xpmem/xpmem.spec index 6dbed23e477..d2ccec560bc 100644 --- a/SPECS/xpmem/xpmem.spec +++ b/SPECS/xpmem/xpmem.spec @@ -247,6 +247,6 @@ fi %endif %changelog -* Tue Dec 17 2024 Binu Jose Philip +* Tue Dec 17 2024 Binu Jose Philip - 2.7.4-1 - Initial Azure Linux import from NVIDIA (license: GPLv2) - License verified