Skip to content

Commit 8407b38

Browse files
binujpBinu Jose Philip
authored and
SumitJenaHCL
committed
mofed and deps signed spec cleanup (microsoft#11993)
Co-authored-by: Binu Jose Philip <[email protected]>
1 parent 7c9437c commit 8407b38

File tree

18 files changed

+52
-60
lines changed

18 files changed

+52
-60
lines changed

‎SPECS-SIGNED/fwctl-signed/fwctl-signed.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ Vendor: Microsoft Corporation
6161
Distribution: Azure Linux
6262
ExclusiveArch: x86_64
6363

64-
Requires: mlnx-ofa_kernel = %{_version}
65-
Requires: mlnx-ofa_kernel-modules = %{_version}
64+
Requires: mlnx-ofa_kernel = %{version}
65+
Requires: mlnx-ofa_kernel-modules = %{version}
6666
Requires: kernel = %{target_kernel_version_full}
6767
Requires: kmod
6868

@@ -99,7 +99,7 @@ fi # 1 : closed
9999

100100

101101
%changelog
102-
* Tue Dec 16 2024 Binu Jose Philip <[email protected]> - 24.10.0.6.7.1
102+
* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 24.10-1
103103
- Creating signed spec
104104
- Initial Azure Linux import from NVIDIA (license: GPLv2)
105105
- License verified

‎SPECS-SIGNED/iser-signed/iser-signed.spec

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ Vendor: Microsoft Corporation
5656
Distribution: Azure Linux
5757
ExclusiveArch: x86_64
5858

59-
Requires: mlnx-ofa_kernel = %{_version}
60-
Requires: mlnx-ofa_kernel-modules = %{_version}
59+
Requires: mlnx-ofa_kernel = %{version}
60+
Requires: mlnx-ofa_kernel-modules = %{version}
6161
Requires: kernel = %{target_kernel_version_full}
6262
Requires: kmod
6363

@@ -92,9 +92,8 @@ fi # 1 : closed
9292
/lib/modules/%{KVERSION}/updates/
9393
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf
9494

95-
9695
%changelog
97-
* Tue Dec 16 2024 Binu Jose Philip <[email protected]> - 24.10.0.6.7.1
96+
* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 24.10-1
9897
- Creating signed spec
9998
- License verified
10099
- Initial Azure Linux import from NVIDIA (license: GPLv2)

‎SPECS-SIGNED/isert-signed/isert-signed.spec

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ Vendor: Microsoft Corporation
5656
Distribution: Azure Linux
5757
ExclusiveArch: x86_64
5858

59-
Requires: mlnx-ofa_kernel = %{_version}
60-
Requires: mlnx-ofa_kernel-modules = %{_version}
59+
Requires: mlnx-ofa_kernel = %{version}
60+
Requires: mlnx-ofa_kernel-modules = %{version}
6161
Requires: kernel = %{target_kernel_version_full}
6262
Requires: kmod
6363

@@ -68,7 +68,6 @@ isert signed kernel modules
6868

6969
%build
7070

71-
7271
%install
7372
rpm2cpio %{SOURCE0} | cpio -idmv -D %{buildroot}
7473

@@ -92,9 +91,8 @@ fi # 1 : closed
9291
/lib/modules/%{KVERSION}/updates/
9392
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf
9493

95-
9694
%changelog
97-
* Tue Dec 16 2024 Binu Jose Philip <[email protected]> - 24.10.0.6.7.1
95+
* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 24.10-1
9896
- Creating signed spec
9997
- License verified
10098
- Initial Azure Linux import from NVIDIA (license: GPLv2)

‎SPECS-SIGNED/knem-signed/knem-modules-signed.spec

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,9 @@ fi
9191
%files
9292
%{_datadir}/licenses
9393
/lib/modules/
94-
%if %{IS_RHEL_VENDOR}
95-
%if ! 0%{?fedora}
96-
%config(noreplace) %{_sysconfdir}/depmod.d/%{_name}.conf
97-
%endif
98-
%endif
99-
10094

10195
%changelog
102-
* Tue Dec 16 2024 Binu Jose Philip <[email protected]> - 1.1.4.90mlnx3
96+
* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 1.1.4.90mlnx3-1
10397
- Creating signed spec
10498
- Initial Azure Linux import from NVIDIA (license: GPLv2)
10599
- License verified

‎SPECS-SIGNED/mft_kernel-signed/mft_kernel-signed.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ rm -rf %{buildroot}
6262
/lib/modules/%{KVERSION}/updates/
6363

6464
%changelog
65-
* Tue Dec 16 2024 Binu Jose Philip <[email protected]> - 4.30.0
65+
* Tue Dec 16 2024 Binu Jose Philip <[email protected]> - 4.30.0-1
6666
- Creating signed spec
6767
- Initial Azure Linux import from NVIDIA (license: GPLv2)
6868
- License verified

‎SPECS-SIGNED/mlnx-nfsrdma-signed/mlnx-nfsrdma-signed.spec

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
%global KVERSION %{target_kernel_version_full}
3434

35+
%define mlnx_version 24.10
36+
3537
%{!?_name: %define _name mlnx-nfsrdma}
3638

3739
Summary: %{_name} Driver
@@ -58,8 +60,8 @@ Vendor: Microsoft Corporation
5860
Distribution: Azure Linux
5961
ExclusiveArch: x86_64
6062

61-
Requires: mlnx-ofa_kernel = %{_version}
62-
Requires: mlnx-ofa_kernel-modules = %{_version}
63+
Requires: mlnx-ofa_kernel = %{mlnx_version}
64+
Requires: mlnx-ofa_kernel-modules = %{mlnx_version}
6365
Requires: kernel = %{target_kernel_version_full}
6466
Requires: kmod
6567

@@ -96,9 +98,8 @@ fi
9698
/lib/modules/%{KVERSION}/updates/
9799
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf
98100

99-
100101
%changelog
101-
* Tue Dec 16 2024 Binu Jose Philip <[email protected]> - 24.10.0.6.7.1
102+
* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 24.10-1
102103
- Creating signed spec
103104
- Initial Azure Linux import from NVIDIA (license: GPLv2)
104105
- License verified

‎SPECS-SIGNED/mlnx-ofa_kernel-signed/mlnx-ofa_kernel-modules-signed.spec

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ Source16: ib_iser.ko
7272
Source17: ib_isert.ko
7373
Source18: ib_srp.ko
7474
Source19: mlx5_core.ko
75-
Source10: mlxfw.ko
76-
Source11: mlxsw_spectrum.ko
77-
Source12: nvme-rdma.ko
78-
Source13: nvmet-rdma.ko
79-
Source14: mlxdevm.ko
80-
Source15: smc.ko
81-
Source16: smc_diag.ko
82-
Source17: rpcrdma.ko
83-
Source18: svcrdma.ko
84-
Source19: xprtrdma.ko
75+
Source20: mlxfw.ko
76+
Source21: mlxsw_spectrum.ko
77+
Source22: nvme-rdma.ko
78+
Source23: nvmet-rdma.ko
79+
Source24: mlxdevm.ko
80+
Source25: smc.ko
81+
Source26: smc_diag.ko
82+
Source27: rpcrdma.ko
83+
Source28: svcrdma.ko
84+
Source29: xprtrdma.ko
8585

8686
Vendor: Microsoft Corporation
8787
Distribution: Azure Linux
@@ -144,16 +144,16 @@ cp -r %{SOURCE16} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniban
144144
cp -r %{SOURCE17} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/isert/ib_isert.ko
145145
cp -r %{SOURCE18} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/infiniband/ulp/srp/ib_srp.ko
146146
cp -r %{SOURCE19} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko
147-
cp -r %{SOURCE10} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxfw/mlxfw.ko
148-
cp -r %{SOURCE11} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
149-
cp -r %{SOURCE12} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/host/nvme-rdma.ko
150-
cp -r %{SOURCE13} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/target/nvmet-rdma.ko
151-
cp -r %{SOURCE14} %{buildroot}/lib/modules/%{KVERSION}/updates/net/mlxdevm/mlxdevm.ko
152-
cp -r %{SOURCE15} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc.ko
153-
cp -r %{SOURCE16} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc_diag.ko
154-
cp -r %{SOURCE17} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/rpcrdma.ko
155-
cp -r %{SOURCE18} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/svcrdma.ko
156-
cp -r %{SOURCE19} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/xprtrdma.ko
147+
cp -r %{SOURCE20} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxfw/mlxfw.ko
148+
cp -r %{SOURCE21} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
149+
cp -r %{SOURCE22} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/host/nvme-rdma.ko
150+
cp -r %{SOURCE23} %{buildroot}/lib/modules/%{KVERSION}/updates/drivers/nvme/target/nvmet-rdma.ko
151+
cp -r %{SOURCE24} %{buildroot}/lib/modules/%{KVERSION}/updates/net/mlxdevm/mlxdevm.ko
152+
cp -r %{SOURCE25} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc.ko
153+
cp -r %{SOURCE26} %{buildroot}/lib/modules/%{KVERSION}/updates/net/smc/smc_diag.ko
154+
cp -r %{SOURCE27} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/rpcrdma.ko
155+
cp -r %{SOURCE28} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/svcrdma.ko
156+
cp -r %{SOURCE29} %{buildroot}/lib/modules/%{KVERSION}/updates/net/sunrpc/xprtrdma/xprtrdma.ko
157157

158158
%clean
159159
rm -rf %{buildroot}
@@ -171,7 +171,7 @@ fi
171171
%license %{_datadir}/licenses/%{name}/copyright
172172

173173
%changelog
174-
* Tue Dec 16 2024 Binu Jose Philip <[email protected]> - 24.10
174+
* Sat Jan 18 2025 Binu Jose Philip <[email protected]> - 24.10-1
175175
- Creating signed spec
176176
- Initial Azure Linux import from NVIDIA (license: GPLv2)
177177
- License verified

‎SPECS-SIGNED/srp-signed/srp-signed.spec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ Vendor: Microsoft Corporation
5757
Distribution: Azure Linux
5858
ExclusiveArch: x86_64
5959

60-
Requires: mlnx-ofa_kernel = %{_version}
61-
Requires: mlnx-ofa_kernel-modules = %{_version}
60+
Requires: mlnx-ofa_kernel = %{version}
61+
Requires: mlnx-ofa_kernel-modules = %{version}
6262
Requires: kernel = %{target_kernel_version_full}
6363
Requires: kmod
6464

@@ -78,15 +78,15 @@ cp -r %{SOURCE2} %{buildroot}/lib/modules/%{KVERSION}/updates/srp/scsi/scsi_tran
7878
%clean
7979
rm -rf %{buildroot}
8080

81-
%files modules
81+
%files
8282
%defattr(-,root,root,-)
8383
/lib/modules/%{KVERSION}/updates/srp/ib_srp.ko
8484
/lib/modules/%{KVERSION}/updates/srp/scsi/scsi_transport_srp.ko
8585
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{name}-*.conf
8686
%license %{_datadir}/licenses/%{name}/copyright
8787

8888
%changelog
89-
* Thu Jan 9 2024 Binu Jose Philip <[email protected]>
89+
* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 24.10-1
9090
- Creating signed spec
9191
- Initial Azure Linux import from NVIDIA (license: GPLv2)
9292
- License verified

‎SPECS-SIGNED/xpmem-signed/xpmem-modules-signed.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ cp -r %{SOURCE1} %{buildroot}/lib/modules/%{KVERSION}/updates/xpmem.ko
5757
%clean
5858
rm -rf %{buildroot}
5959

60-
%files modules
60+
%files
6161
/lib/modules/%{KVERSION}/updates/xpmem.ko
6262
%{_datadir}/licenses
6363

6464

6565
%changelog
66-
* Tue Dec 16 2024 Binu Jose Philip <[email protected]> - 2.7.4
66+
* Sat Jan 18 2024 Binu Jose Philip <[email protected]> - 2.7.4-1
6767
- Creating signed spec
6868
- Initial Azure Linux import from NVIDIA (license: GPLv2)
6969
- License verified

‎SPECS/fwctl/fwctl.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ fi # 1 : closed
250250
%endif
251251

252252
%changelog
253-
* Tue Dec 17 2024 Binu Jose Philip <[email protected]>
253+
* Tue Dec 17 2024 Binu Jose Philip <[email protected]> - 24.10-1
254254
- Initial Azure Linux import from NVIDIA (license: GPLv2)
255255
- License verified
256256
* Mon Jul 29 2024 <[email protected]>

0 commit comments

Comments
 (0)