Skip to content

Commit 1031663

Browse files
PawelWMSPawelWMS
authored
Removed duplicate user space packages from OOT kmod specs (microsoft#14860)
1 parent b2b9874 commit 1031663

File tree

34 files changed

+292
-544
lines changed

34 files changed

+292
-544
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
%global KVERSION %{target_kernel_version_full}
4444

4545
%{!?_name: %define _name fwctl-hwe}
46-
%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}}
46+
%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}}
4747

4848
Summary: %{_name} Driver
4949
Name: %{_name}-signed
5050
Version: 24.10
51-
Release: 22%{release_suffix}%{?dist}
51+
Release: 23%{release_suffix}%{?dist}
5252
License: GPLv2
5353
Url: http://nvidia.com
5454
Group: System Environment/Base
@@ -73,7 +73,7 @@ fwctl signed kernel modules
7373

7474
%package -n %{_name}
7575
Summary: %{summary}
76-
Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version}
76+
Requires: mlnx-ofa_kernel
7777
Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version}
7878
Requires: kernel-hwe = %{target_kernel_version_full}
7979
Requires: kmod
@@ -120,6 +120,9 @@ fi # 1 : closed
120120
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-fwctl-*.conf
121121

122122
%changelog
123+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 24.10-23_6.12.50.2-1
124+
- Adjusted package dependencies on user space components.
125+
123126
* Fri Oct 06 2025 Siddharth Chintamaneni <[email protected]> - 24.10-22_6.12.50.2-1
124127
- Bump to match kernel-hwe
125128
- Fix signed spec for -hwe variant

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
%global KVERSION %{target_kernel_version_full}
4343

4444
%{!?_name: %define _name fwctl}
45-
%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}}
45+
%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}}
4646

4747
Summary: %{_name} Driver
4848
Name: %{_name}-signed
4949
Version: 24.10
50-
Release: 20%{release_suffix}%{?dist}
50+
Release: 21%{release_suffix}%{?dist}
5151
License: GPLv2
5252
Url: http://nvidia.com
5353
Group: System Environment/Base
@@ -119,6 +119,9 @@ fi # 1 : closed
119119

120120

121121
%changelog
122+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 24.10-21
123+
- Bump mofed release number
124+
122125
* Thu May 29 2025 Nicolas Guibourge <[email protected]> - 24.10-20
123126
- Add kernel version and release nb into release nb
124127

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
%global KVERSION %{target_kernel_version_full}
4040

4141
%{!?_name: %define _name iser-hwe}
42-
%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}}
42+
%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}}
4343

4444
Summary: %{_name} Driver
4545
Name: %{_name}-signed
4646
Version: 24.10
47-
Release: 22%{release_suffix}%{?dist}
47+
Release: 23%{release_suffix}%{?dist}
4848
License: GPLv2
4949
Url: http://www.mellanox.com
5050
Group: System Environment/Base
@@ -68,7 +68,7 @@ iser signed kernel modules
6868

6969
%package -n %{_name}
7070
Summary: %{summary}
71-
Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version}
71+
Requires: mlnx-ofa_kernel
7272
Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version}
7373
Requires: kernel-hwe = %{target_kernel_version_full}
7474
Requires: kmod
@@ -112,6 +112,9 @@ fi # 1 : closed
112112
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-iser-*.conf
113113

114114
%changelog
115+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 24.10-23_6.12.50.2-1
116+
- Adjusted package dependencies on user space components.
117+
115118
* Fri Oct 06 2025 Siddharth Chintamaneni <[email protected]> - 24.10-22_6.12.50.2-1
116119
- Bump to match kernel-hwe
117120
- Fix signed spec for -hwe variant

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
%global KVERSION %{target_kernel_version_full}
3939

4040
%{!?_name: %define _name iser}
41-
%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}}
41+
%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}}
4242

4343
Summary: %{_name} Driver
4444
Name: %{_name}-signed
4545
Version: 24.10
46-
Release: 20%{release_suffix}%{?dist}
46+
Release: 21%{release_suffix}%{?dist}
4747
License: GPLv2
4848
Url: http://www.mellanox.com
4949
Group: System Environment/Base
@@ -110,6 +110,9 @@ fi # 1 : closed
110110
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{_name}-*.conf
111111

112112
%changelog
113+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 24.10-21
114+
- Bump mofed release number
115+
113116
* Thu May 29 2025 Nicolas Guibourge <[email protected]> - 24.10-20
114117
- Add kernel version and release nb into release nb
115118

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
%global KVERSION %{target_kernel_version_full}
4040

4141
%{!?_name: %define _name isert-hwe}
42-
%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}}
42+
%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}}
4343

4444
Summary: %{_name} Driver
4545
Name: %{_name}-signed
4646
Version: 24.10
47-
Release: 22%{release_suffix}%{?dist}
47+
Release: 23%{release_suffix}%{?dist}
4848
License: GPLv2
4949
Url: http://www.mellanox.com
5050
Group: System Environment/Base
@@ -68,7 +68,7 @@ isert signed kernel modules
6868

6969
%package -n %{_name}
7070
Summary: %{summary}
71-
Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version}
71+
Requires: mlnx-ofa_kernel
7272
Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version}
7373
Requires: kernel-hwe = %{target_kernel_version_full}
7474
Requires: kmod
@@ -111,6 +111,9 @@ fi # 1 : closed
111111
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-isert-*.conf
112112

113113
%changelog
114+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 24.10-23_6.12.50.2-1
115+
- Adjusted package dependencies on user space components.
116+
114117
* Fri Oct 06 2025 Siddharth Chintamaneni <[email protected]> - 24.10-22_6.12.50.2-1
115118
- Bump to match kernel-hwe
116119
- Fix signed spec for -hwe variant

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
%global KVERSION %{target_kernel_version_full}
3939

4040
%{!?_name: %define _name isert}
41-
%{!?_mofed_full_version: %define _mofed_full_version 24.10-20%{release_suffix}%{?dist}}
41+
%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}}
4242

4343
Summary: %{_name} Driver
4444
Name: %{_name}-signed
4545
Version: 24.10
46-
Release: 20%{release_suffix}%{?dist}
46+
Release: 21%{release_suffix}%{?dist}
4747
License: GPLv2
4848
Url: http://www.mellanox.com
4949
Group: System Environment/Base
@@ -109,6 +109,9 @@ fi # 1 : closed
109109
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-%{_name}-*.conf
110110

111111
%changelog
112+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 24.10-21
113+
- Bump mofed release number
114+
112115
* Thu May 29 2025 Nicolas Guibourge <[email protected]> - 24.10-20
113116
- Add kernel version and release nb into release nb
114117

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
Summary: KNEM: High-Performance Intra-Node MPI Communication
4545
Name: %{_name}-signed
4646
Version: 1.1.4.90mlnx3
47-
Release: 22%{release_suffix}%{?dist}
47+
Release: 23%{release_suffix}%{?dist}
4848
Provides: knem-hwe-mlnx = %{version}-%{release}
4949
Obsoletes: knem-hwe-mlnx < %{version}-%{release}
5050
License: BSD and GPLv2
@@ -110,6 +110,9 @@ fi
110110
/lib/modules/
111111

112112
%changelog
113+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 1.1.4.90mlnx3-23_6.12.50.2-1
114+
- Bump release to rebuild for new release
115+
113116
* Fri Oct 06 2025 Siddharth Chintamaneni <[email protected]> - 1.1.4.90mlnx3-22_6.12.50.2-1
114117
- Bump to match kernel-hwe
115118
- Fix signed spec for -hwe variant

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Summary: KNEM: High-Performance Intra-Node MPI Communication
4444
Name: %{_name}-signed
4545
Version: 1.1.4.90mlnx3
46-
Release: 20%{release_suffix}%{?dist}
46+
Release: 21%{release_suffix}%{?dist}
4747
Provides: knem-mlnx = %{version}-%{release}
4848
Obsoletes: knem-mlnx < %{version}-%{release}
4949
License: BSD and GPLv2
@@ -108,6 +108,9 @@ fi
108108
/lib/modules/
109109

110110
%changelog
111+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 1.1.4.90mlnx3-21
112+
- Bump release to rebuild for new release
113+
111114
* Thu May 29 2025 Nicolas Guibourge <[email protected]> - 1.1.4.90mlnx3-20
112115
- Add kernel version and release nb into release nb
113116

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
Name: %{_name}-signed
1616
Summary: %{_name} Kernel Module for the %{KVERSION} kernel
1717
Version: 4.30.0
18-
Release: 22%{release_suffix}%{?dist}
18+
Release: 23%{release_suffix}%{?dist}
1919
License: Dual BSD/GPLv2
2020
Group: System Environment/Kernel
2121

@@ -84,6 +84,9 @@ popd
8484
/lib/modules/%{KVERSION}/updates/
8585

8686
%changelog
87+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 4.30.0-23_6.12.50.2-1
88+
- Bump release to rebuild for new release
89+
8790
* Fri Oct 06 2025 Siddharth Chintamaneni <[email protected]> - 4.30.0-22_6.12.50.2-1
8891
- Bump to match kernel-hwe
8992
- Fix signed spec for -hwe variant

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838

3939
%global KVERSION %{target_kernel_version_full}
4040

41-
%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{release_suffix}%{?dist}}
41+
%{!?_mofed_full_version: %define _mofed_full_version 24.10-23%{release_suffix}%{?dist}}
4242

4343
%{!?_name: %define _name mlnx-nfsrdma-hwe}
4444

4545
Summary: %{_name} Driver
4646
Name: %{_name}-signed
4747
Version: 24.10
48-
Release: 22%{release_suffix}%{?dist}
48+
Release: 23%{release_suffix}%{?dist}
4949
License: GPLv2
5050
Url: http://www.mellanox.com
5151
Group: System Environment/Base
@@ -71,7 +71,7 @@ mellanox rdma signed kernel modules
7171

7272
%package -n %{_name}
7373
Summary: %{summary}
74-
Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version}
74+
Requires: mlnx-ofa_kernel
7575
Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version}
7676
Requires: kernel-hwe = %{target_kernel_version_full}
7777
Requires: kmod
@@ -119,6 +119,9 @@ fi
119119
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-mlnx-nfsrdma-*.conf
120120

121121
%changelog
122+
* Fri Oct 10 2025 Pawel Winogrodzki <[email protected]> - 24.10-23_6.12.50.2-1
123+
- Adjusted package dependencies on user space components.
124+
122125
* Fri Oct 06 2025 Siddharth Chintamaneni <[email protected]> - 24.10-22_6.12.50.2-1
123126
- Bump to match kernel-hwe
124127
- Fix signed spec for -hwe variant

0 commit comments

Comments
 (0)