mofed and deps signed spec cleanup (#11993)

Co-authored-by: Binu Jose Philip <[email protected]>
microsoft · Jan 18, 2025 · fc5b1e8 · fc5b1e8
1 parent 417be0b
commit fc5b1e8
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 60 deletions.
diff --git a/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec b/SPECS-SIGNED/fwctl-signed/fwctl-signed.spec
@@ -61,8 +61,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 = %{version}
+Requires:       mlnx-ofa_kernel-modules  = %{version}
 Requires:       kernel = %{target_kernel_version_full}
 Requires:       kmod
 
@@ -99,7 +99,7 @@ fi # 1 : closed
 
 
 %changelog
-* Tue Dec  16 2024 Binu Jose Philip <[email protected]> - 24.10.0.6.7.1
+* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 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
@@ -56,8 +56,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 = %{version}
+Requires:       mlnx-ofa_kernel-modules  = %{version}
 Requires:       kernel = %{target_kernel_version_full}
 Requires:       kmod
 
@@ -92,9 +92,8 @@ fi # 1 : closed
 /lib/modules/%{KVERSION}/updates/
 %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf
 
-
 %changelog
-* Tue Dec  16 2024 Binu Jose Philip <[email protected]> - 24.10.0.6.7.1
+* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 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
@@ -56,8 +56,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 = %{version}
+Requires:       mlnx-ofa_kernel-modules  = %{version}
 Requires:       kernel = %{target_kernel_version_full}
 Requires:       kmod
 
@@ -68,7 +68,6 @@ isert signed kernel modules
 
 %build
 
-
 %install
 rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
 
@@ -92,9 +91,8 @@ fi # 1 : closed
 /lib/modules/%{KVERSION}/updates/
 %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf
 
-
 %changelog
-* Tue Dec  16 2024 Binu Jose Philip <[email protected]> - 24.10.0.6.7.1
+* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 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
@@ -91,15 +91,9 @@ fi
 %files
 %{_datadir}/licenses
 /lib/modules/
-%if %{IS_RHEL_VENDOR}
-%if ! 0%{?fedora}
-%config(noreplace) %{_sysconfdir}/depmod.d/%{_name}.conf
-%endif
-%endif
-
 
 %changelog
-* Tue Dec  16 2024 Binu Jose Philip <[email protected]> - 1.1.4.90mlnx3
+* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 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
@@ -62,7 +62,7 @@ rm -rf %{buildroot}
 /lib/modules/%{KVERSION}/updates/
 
 %changelog
-* Tue Dec  16 2024 Binu Jose Philip <[email protected]> - 4.30.0
+* Tue Dec  16 2024 Binu Jose Philip <[email protected]> - 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
@@ -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,9 +98,8 @@ fi
 /lib/modules/%{KVERSION}/updates/
 %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf
 
-
 %changelog
-* Tue Dec  16 2024 Binu Jose Philip <[email protected]> - 24.10.0.6.7.1
+* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 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
@@ -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,7 +171,7 @@ fi
 %license %{_datadir}/licenses/%{name}/copyright
 
 %changelog
-* Tue Dec  16 2024 Binu Jose Philip <[email protected]> - 24.10
+* Sat Jan 18 2025 Binu Jose Philip <[email protected]> - 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
@@ -57,8 +57,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 = %{version}
+Requires:       mlnx-ofa_kernel-modules  = %{version}
 Requires:       kernel = %{target_kernel_version_full}
 Requires:       kmod
 
@@ -78,15 +78,15 @@ 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
 %config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf
 %license %{_datadir}/licenses/%{name}/copyright
 
 %changelog
-* Thu Jan 9 2024 Binu Jose Philip <[email protected]>
+* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 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
@@ -57,13 +57,13 @@ 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
-* Tue Dec  16 2024 Binu Jose Philip <[email protected]> - 2.7.4
+* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 2.7.4-1
 - Creating signed spec
 - Initial Azure Linux import from NVIDIA (license: GPLv2)
 - License verified
diff --git 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 <[email protected]>
+* Tue Dec  17 2024 Binu Jose Philip <[email protected]> - 24.10-1
 - Initial Azure Linux import from NVIDIA (license: GPLv2)
 - License verified
 * Mon Jul 29 2024 <[email protected]>

diff --git 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 <[email protected]>
+* Tue Dec  17 2024 Binu Jose Philip <[email protected]> - 24.10-1
 - Initial Azure Linux import from NVIDIA (license: GPLv2)
 - License verified
 * Thu Feb 20 2014 Alaa Hleihel <[email protected]>

diff --git 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 <[email protected]>
+* Tue Dec  17 2024 Binu Jose Philip <[email protected]> - 24.10-1
 - Initial Azure Linux import from NVIDIA (license: GPLv2)
 - License verified
 * Thu Feb 20 2014 Alaa Hleihel <[email protected]>

diff --git a/SPECS/knem/knem.spec b/SPECS/knem/knem.spec
@@ -282,7 +282,7 @@ fi
 %endif
 
 %changelog
-* Tue Dec  17 2024 Binu Jose Philip <[email protected]>
+* Tue Dec  17 2024 Binu Jose Philip <[email protected]> - 1.1.4.90mlnx3-1
 - Initial Azure Linux import from NVIDIA (license: GPLv2)
 - License verified
 * Mon Mar 17 2014 Alaa Hleihel <[email protected]>

diff --git 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 <[email protected]>
+* Tue Dec  17 2024 Binu Jose Philip <[email protected]> - 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
@@ -248,7 +248,7 @@ fi
 %endif
 
 %changelog
-* Tue Dec  17 2024 Binu Jose Philip <[email protected]>
+* Tue Dec  17 2024 Binu Jose Philip <[email protected]> - 24.10-1
 - Initial Azure Linux import from NVIDIA (license: GPLv2)
 - License verified
 * Mon Aug 15 2016 Alaa Hleihel <[email protected]>

diff --git 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 <[email protected]>
+* Tue Dec  17 2024 Binu Jose Philip <[email protected]> - 24.10-1
 - Initial Azure Linux import from NVIDIA (license: GPLv2)
 - License verified
 * Thu Jun 18 2015 Alaa Hleihel <[email protected]>

diff --git a/SPECS/srp/srp.spec b/SPECS/srp/srp.spec
@@ -253,7 +253,7 @@ fi
 %endif
 
 %changelog
-* Thu Jan 9 2024 Binu Jose Philip <[email protected]>
+* Thu Jan 9 2024 Binu Jose Philip <[email protected]> - 24.10-1
 - Initial Azure Linux import from NVIDIA (license: GPLv2)
 - License verified
 * Thu Feb 20 2014 Alaa Hleihel <[email protected]>

diff --git a/SPECS/xpmem/xpmem.spec b/SPECS/xpmem/xpmem.spec
@@ -247,6 +247,6 @@ fi
 %endif
 
 %changelog
-* Tue Dec  17 2024 Binu Jose Philip <[email protected]>
+* Tue Dec  17 2024 Binu Jose Philip <[email protected]> - 2.7.4-1
 - Initial Azure Linux import from NVIDIA (license: GPLv2)
 - License verified