Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit40dda62

Browse files
kernel-hwe: Updating kernel to 6.12.50.2 and introducing hwe-kernel for x86_64 (#14809)
1 parent11cb291 commit40dda62

File tree

26 files changed

+8832
-155
lines changed

26 files changed

+8832
-155
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@
3535
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
3636

3737
# hard code versions due to ADO bug:58993948
38-
%global target_azl_build_kernel_version 6.12.40.1
39-
%global target_kernel_release2
38+
%global target_azl_build_kernel_version 6.12.50.2
39+
%global target_kernel_release1
4040
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
4141
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
4242

4343
%global KVERSION %{target_kernel_version_full}
4444

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

4848
Summary: %{_name} Driver
4949
Name: %{_name}-signed
5050
Version: 24.10
51-
Release:21%{release_suffix}%{?dist}
51+
Release:22%{release_suffix}%{?dist}
5252
License: GPLv2
5353
Url: http://nvidia.com
5454
Group: System Environment/Base
@@ -77,6 +77,7 @@ Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version}
7777
Requires: mlnx-ofa_kernel-hwe-modules= %{_mofed_full_version}
7878
Requires: kernel-hwe= %{target_kernel_version_full}
7979
Requires: kmod
80+
Conflicts: fwctl
8081

8182
%description -n %{_name}
8283
%{description}
@@ -119,6 +120,10 @@ fi # 1 : closed
119120
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-fwctl-*.conf
120121

121122
%changelog
123+
*Fri Oct 06 2025Siddharth Chintamaneni<sidchintamaneni@gmail.com> -24.10-22_6.12.50.2-1
124+
-Bump to match kernel-hwe
125+
-Fix signed spec for -hwe variant
126+
122127
*Fri Sep 12 2025Rachel Menge<rachelmenge@microsoft.com> -24.10-21
123128
-Bump to match kernel-hwe
124129

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@
3131
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
3232

3333
# hard code versions due to ADO bug:58993948
34-
%global target_azl_build_kernel_version 6.12.40.1
35-
%global target_kernel_release2
34+
%global target_azl_build_kernel_version 6.12.50.2
35+
%global target_kernel_release1
3636
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3737
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3838

3939
%global KVERSION %{target_kernel_version_full}
4040

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

4444
Summary: %{_name} Driver
4545
Name: %{_name}-signed
4646
Version: 24.10
47-
Release:21%{release_suffix}%{?dist}
47+
Release:22%{release_suffix}%{?dist}
4848
License: GPLv2
4949
Url: http://www.mellanox.com
5050
Group: System Environment/Base
@@ -72,6 +72,7 @@ Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version}
7272
Requires: mlnx-ofa_kernel-hwe-modules= %{_mofed_full_version}
7373
Requires: kernel-hwe= %{target_kernel_version_full}
7474
Requires: kmod
75+
Conflicts: iser
7576

7677
%description -n %{_name}
7778
%{description}
@@ -111,6 +112,10 @@ fi # 1 : closed
111112
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-iser-*.conf
112113

113114
%changelog
115+
*Fri Oct 06 2025Siddharth Chintamaneni<sidchintamaneni@gmail.com> -24.10-22_6.12.50.2-1
116+
-Bump to match kernel-hwe
117+
-Fix signed spec for -hwe variant
118+
114119
*Fri Sep 12 2025Rachel Menge<rachelmenge@microsoft.com> -24.10-21
115120
-Bump to match kernel-hwe
116121

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@
3131
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
3232

3333
# hard code versions due to ADO bug:58993948
34-
%global target_azl_build_kernel_version 6.12.40.1
35-
%global target_kernel_release2
34+
%global target_azl_build_kernel_version 6.12.50.2
35+
%global target_kernel_release1
3636
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3737
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3838

3939
%global KVERSION %{target_kernel_version_full}
4040

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

4444
Summary: %{_name} Driver
4545
Name: %{_name}-signed
4646
Version: 24.10
47-
Release:21%{release_suffix}%{?dist}
47+
Release:22%{release_suffix}%{?dist}
4848
License: GPLv2
4949
Url: http://www.mellanox.com
5050
Group: System Environment/Base
@@ -72,6 +72,7 @@ Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version}
7272
Requires: mlnx-ofa_kernel-hwe-modules= %{_mofed_full_version}
7373
Requires: kernel-hwe= %{target_kernel_version_full}
7474
Requires: kmod
75+
Conflicts: isert
7576

7677
%description -n %{_name}
7778
%{description}
@@ -110,6 +111,10 @@ fi # 1 : closed
110111
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-isert-*.conf
111112

112113
%changelog
114+
*Fri Oct 06 2025Siddharth Chintamaneni<sidchintamaneni@gmail.com> -24.10-22_6.12.50.2-1
115+
-Bump to match kernel-hwe
116+
-Fix signed spec for -hwe variant
117+
113118
*Fri Sep 12 2025Rachel Menge<rachelmenge@microsoft.com> -24.10-21
114119
-Bump to match kernel-hwe
115120

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
%global debug_package %{nil}
2+
%ifarchx86_64
3+
%global buildarchx86_64
4+
%endif
5+
%ifarchaarch64
26
%global buildarchaarch64
7+
%endif
38
%define uname_r %{version}-%{release}
49
Summary: Signed Linux Kernel for %{buildarch} systems
510
Name: kernel-hwe-signed-%{buildarch}
6-
Version: 6.12.40.1
7-
Release:2%{?dist}
11+
Version: 6.12.50.2
12+
Release:1%{?dist}
813
License: GPLv2
914
Vendor: Microsoft Corporation
1015
Distribution: Azure Linux
@@ -24,7 +29,6 @@ URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel
2429
# 4. Build this spec
2530
Source0: kernel-hwe-%{version}-%{release}.%{buildarch}.rpm
2631
Source1: vmlinuz-%{uname_r}
27-
ExclusiveArch:aarch64
2832
BuildRequires: cpio
2933
BuildRequires: grub2-rpm-macros
3034
BuildRequires: openssl
@@ -96,6 +100,10 @@ echo "initrd of kernel %{uname_r} removed" >&2
96100
%exclude /module_info.ld
97101

98102
%changelog
103+
*Fri Oct 06 2025Siddharth Chintamaneni<sidchintamaneni@gmail.com> -6.12.50.2-1
104+
-Bump to match kernel-hwe
105+
-Adds support to x86_64
106+
99107
*Fri Sep 12 2025Rachel Menge<rachelmenge@microsoft.com> -6.12.40.1-2
100108
-Bump to match kernel-hwe
101109

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
2929

3030
# hard code versions due to ADO bug:58993948
31-
%global target_azl_build_kernel_version 6.12.40.1
32-
%global target_kernel_release2
31+
%global target_azl_build_kernel_version 6.12.50.2
32+
%global target_kernel_release1
3333
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3434
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3535

@@ -44,14 +44,15 @@
4444
Summary: KNEM: High-Performance Intra-Node MPI Communication
4545
Name: %{_name}-signed
4646
Version: 1.1.4.90mlnx3
47-
Release:21%{release_suffix}%{?dist}
47+
Release:22%{release_suffix}%{?dist}
4848
Provides: knem-hwe-mlnx= %{version}-%{release}
4949
Obsoletes: knem-hwe-mlnx< %{version}-%{release}
5050
License: BSD and GPLv2
5151
Group: System Environment/Libraries
5252
Vendor: Microsoft Corporation
5353
Distribution: Azure Linux
5454
ExclusiveArch:aarch64
55+
Conflicts: knem
5556

5657
#
5758
# To populate these sources:
@@ -84,7 +85,7 @@ pushd rpm_contents
8485

8586
# This spec's whole purpose is to inject the signed modules
8687
rpm2cpio %{SOURCE0} | cpio -idmv
87-
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/extra/%{_name}/knem.ko
88+
cp -rf %{SOURCE1} ./lib/modules/%{KVERSION}/extra/knem-hwe/knem.ko
8889
popd
8990

9091
%install
@@ -109,6 +110,10 @@ fi
109110
/lib/modules/
110111

111112
%changelog
113+
*Fri Oct 06 2025Siddharth Chintamaneni<sidchintamaneni@gmail.com> -1.1.4.90mlnx3-22_6.12.50.2-1
114+
-Bump to match kernel-hwe
115+
-Fix signed spec for -hwe variant
116+
112117
*Fri Sep 12 2025Rachel Menge<rachelmenge@microsoft.com> -1.1.4.90mlnx3-21
113118
-Bump to match kernel-hwe
114119

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
55

66
# hard code versions due to ADO bug:58993948
7-
%global target_azl_build_kernel_version 6.12.40.1
8-
%global target_kernel_release2
7+
%global target_azl_build_kernel_version 6.12.50.2
8+
%global target_kernel_release1
99
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
1010
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
1111

@@ -15,7 +15,7 @@
1515
Name: %{_name}-signed
1616
Summary: %{_name} Kernel Module for the %{KVERSION} kernel
1717
Version: 4.30.0
18-
Release:21%{release_suffix}%{?dist}
18+
Release:22%{release_suffix}%{?dist}
1919
License: Dual BSD/GPLv2
2020
Group: System Environment/Kernel
2121

@@ -32,6 +32,8 @@ Source2: mst_pciconf.ko
3232
Vendor: Microsoft Corporation
3333
Distribution: Azure Linux
3434
ExclusiveArch:aarch64
35+
Conflicts: mft_kernel
36+
Conflicts: kernel-mft
3537

3638
# Azure Linux attempts to match the spec file name and the "Name" tag.
3739
# Upstream's mft_kernel spec set rpm name as kernel-mft. To comply, we
@@ -82,6 +84,10 @@ popd
8284
/lib/modules/%{KVERSION}/updates/
8385

8486
%changelog
87+
*Fri Oct 06 2025Siddharth Chintamaneni<sidchintamaneni@gmail.com> -4.30.0-22_6.12.50.2-1
88+
-Bump to match kernel-hwe
89+
-Fix signed spec for -hwe variant
90+
8591
*Fri Sep 12 2025Rachel Menge<rachelmenge@microsoft.com> -4.30.0-21
8692
-Bump to match kernel-hwe
8793

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
3232

3333
# hard code versions due to ADO bug:58993948
34-
%global target_azl_build_kernel_version 6.12.40.1
35-
%global target_kernel_release2
34+
%global target_azl_build_kernel_version 6.12.50.2
35+
%global target_kernel_release1
3636
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3737
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3838

3939
%global KVERSION %{target_kernel_version_full}
4040

41-
%{!?_mofed_full_version: %define _mofed_full_version 24.10-21%{release_suffix}%{?dist}}
41+
%{!?_mofed_full_version: %define _mofed_full_version 24.10-22%{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:21%{release_suffix}%{?dist}
48+
Release:22%{release_suffix}%{?dist}
4949
License: GPLv2
5050
Url: http://www.mellanox.com
5151
Group: System Environment/Base
@@ -75,6 +75,7 @@ Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version}
7575
Requires: mlnx-ofa_kernel-hwe-modules= %{_mofed_full_version}
7676
Requires: kernel-hwe= %{target_kernel_version_full}
7777
Requires: kmod
78+
Conflicts: mlnx-nfsrdma
7879

7980
%description -n %{_name}
8081
%{description}
@@ -118,6 +119,10 @@ fi
118119
%config(noreplace) %{_sysconfdir}/depmod.d/zz02-mlnx-nfsrdma-*.conf
119120

120121
%changelog
122+
*Fri Oct 06 2025Siddharth Chintamaneni<sidchintamaneni@gmail.com> -24.10-22_6.12.50.2-1
123+
-Bump to match kernel-hwe
124+
-Fix signed spec for -hwe variant
125+
121126
*Fri Sep 12 2025Rachel Menge<rachelmenge@microsoft.com> -24.10-21
122127
-Bump to match kernel-hwe
123128

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
%define __os_install_post %{__os_install_post_leave_signatures} %{nil}
3232

3333
# hard code versions due to ADO bug:58993948
34-
%global target_azl_build_kernel_version 6.12.40.1
35-
%global target_kernel_release2
34+
%global target_azl_build_kernel_version 6.12.50.2
35+
%global target_kernel_release1
3636
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3737
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3838

@@ -46,7 +46,7 @@
4646
Summary: Infiniband HCA Driver
4747
Name: %{_name}-signed
4848
Version: 24.10
49-
Release:21%{release_suffix}%{?dist}
49+
Release:22%{release_suffix}%{?dist}
5050
License: GPLv2
5151
Url: http://www.mellanox.com/
5252
Group: System Environment/Base
@@ -126,6 +126,7 @@ Requires: procps
126126
Requires: module-init-tools
127127
Requires: lsof
128128
Requires: ofed-scripts
129+
Conflicts: mlnx-ofa_kernel
129130

130131
%description -n %{_name}
131132
%{description}
@@ -193,6 +194,10 @@ fi
193194
%license %{_datadir}/licenses/%{_name}/copyright
194195

195196
%changelog
197+
*Fri Oct 06 2025Siddharth Chintamaneni<siddharthc@microsoft.com> -24.10-22_6.12.50.2-1
198+
-Bump to match kernel-hwe
199+
-Fix signed spec for -hwe variant
200+
196201
*Fri Sep 12 2025Rachel Menge<rachelmenge@microsoft.com> -24.10-21
197202
-Bump to match kernel-hwe
198203

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

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

3333
%if 0%{azl}
3434
# hard code versions due to ADO bug:58993948
35-
%global target_azl_build_kernel_version 6.12.40.1
36-
%global target_kernel_release2
35+
%global target_azl_build_kernel_version 6.12.50.2
36+
%global target_kernel_release1
3737
%global target_kernel_version_full %{target_azl_build_kernel_version}-%{target_kernel_release}%{?dist}
3838
%global release_suffix _%{target_azl_build_kernel_version}.%{target_kernel_release}
3939
%else
@@ -43,12 +43,12 @@
4343
%global KVERSION %{target_kernel_version_full}
4444

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

4848
Summary: srp driver
4949
Name: %{_name}-signed
5050
Version: 24.10
51-
Release:21%{release_suffix}%{?dist}
51+
Release:22%{release_suffix}%{?dist}
5252
License: GPLv2
5353
Url: http://www.mellanox.com
5454
Group: System Environment/Base
@@ -77,6 +77,7 @@ Requires: mlnx-ofa_kernel-hwe = %{_mofed_full_version}
7777
Requires: mlnx-ofa_kernel-hwe-modules= %{_mofed_full_version}
7878
Requires: kernel-hwe= %{target_kernel_version_full}
7979
Requires: kmod
80+
Conflicts: srp
8081

8182
%description -n %{_name}
8283
%{description}
@@ -111,6 +112,10 @@ popd
111112
%license %{_datadir}/licenses/%{_name}/copyright
112113

113114
%changelog
115+
*Fri Oct 06 2025Siddharth Chintamaneni<sidchintamaneni@gmail.com> -24.10-22_6.12.50.2-1
116+
-Bump to match kernel-hwe
117+
-Fix signed spec for -hwe variant
118+
114119
*Fri Sep 12 2025Rachel Menge<rachelmenge@microsoft.com> -24.10-21
115120
-Bump to match kernel-hwe
116121

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp