Skip to content

Commit b847500

Browse files
authored
kernel-uki: remove noxsaves parameter from cmdline (#10890)
Signed-off-by: Thien Trung Vuong <tvuong@microsoft.com>
1 parent 07c7a6f commit b847500

9 files changed

Lines changed: 26 additions & 16 deletions

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
1212
Version: 6.6.57.1
13-
Release: 1%{?dist}
13+
Release: 2%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Azure Linux
@@ -145,6 +145,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
145145
%exclude /module_info.ld
146146

147147
%changelog
148+
* Wed Oct 30 2024 Thien Trung Vuong <tvuong@microsoft.com> - 6.6.57.1-2
149+
- Bump release to match kernel
150+
148151
* Tue Oct 29 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.57.1-1
149152
- Auto-upgrade to 6.6.57.1
150153

SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Summary: Signed Unified Kernel Image for %{buildarch} systems
77
Name: kernel-uki-signed-%{buildarch}
88
Version: 6.6.57.1
9-
Release: 1%{?dist}
9+
Release: 2%{?dist}
1010
License: GPLv2
1111
Vendor: Microsoft Corporation
1212
Distribution: Azure Linux
@@ -68,6 +68,9 @@ popd
6868
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
6969

7070
%changelog
71+
* Wed Oct 30 2024 Thien Trung Vuong <tvuong@microsoft.com> - 6.6.57.1-2
72+
- Bump release to match kernel
73+
7174
* Tue Oct 29 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.57.1-1
7275
- Auto-upgrade to 6.6.57.1
7376

SPECS/kernel-headers/kernel-headers.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Summary: Linux API header files
1515
Name: kernel-headers
1616
Version: 6.6.57.1
17-
Release: 1%{?dist}
17+
Release: 2%{?dist}
1818
License: GPLv2
1919
Vendor: Microsoft Corporation
2020
Distribution: Azure Linux
@@ -75,6 +75,9 @@ done
7575
%endif
7676

7777
%changelog
78+
* Wed Oct 30 2024 Thien Trung Vuong <tvuong@microsoft.com> - 6.6.57.1-2
79+
- Bump release to match kernel
80+
7881
* Tue Oct 29 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.57.1-1
7982
- Auto-upgrade to 6.6.57.1
8083

SPECS/kernel/kernel-uki.spec

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,12 @@
88
# suffix, our kernel version does not.
99
%define kernelver %{version}-%{release}
1010

11-
# noxsaves: Azure CVM instances have trouble booting due to the hypervisor
12-
# not reporting an available CPU feature - shadow stack (X86_FEATURE_SHSTK).
13-
# We need to temporarily turn it off by disabling xsaves until the problem
14-
# is fixed on Azure. Since shadow stack depends on xsaves, disabling xsaves
15-
# ensures the feature bit for shadow stack is also turned off.
16-
%define cmdline console=ttyS0 noxsaves
11+
%define cmdline console=ttyS0
1712

1813
Summary: Unified Kernel Image
1914
Name: kernel-uki
2015
Version: 6.6.57.1
21-
Release: 1%{?dist}
16+
Release: 2%{?dist}
2217
License: GPLv2
2318
Vendor: Microsoft Corporation
2419
Distribution: Azure Linux
@@ -75,6 +70,9 @@ cp %{buildroot}/boot/vmlinuz-uki-%{kernelver}.efi %{buildroot}/boot/efi/EFI/Linu
7570
/boot/efi/EFI/Linux/vmlinuz-uki-%{kernelver}.efi
7671

7772
%changelog
73+
* Wed Oct 30 2024 Thien Trung Vuong <tvuong@microsoft.com> - 6.6.57.1-2
74+
- Remove noxsaves parameter from cmdline
75+
7876
* Tue Oct 29 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.57.1-1
7977
- Auto-upgrade to 6.6.57.1
8078

SPECS/kernel/kernel.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
Summary: Linux Kernel
3131
Name: kernel
3232
Version: 6.6.57.1
33-
Release: 1%{?dist}
33+
Release: 2%{?dist}
3434
License: GPLv2
3535
Vendor: Microsoft Corporation
3636
Distribution: Azure Linux
@@ -407,6 +407,9 @@ echo "initrd of kernel %{uname_r} removed" >&2
407407
%{_sysconfdir}/bash_completion.d/bpftool
408408

409409
%changelog
410+
* Wed Oct 30 2024 Thien Trung Vuong <tvuong@microsoft.com> - 6.6.57.1-2
411+
- UKI: remove noxsaves parameter from cmdline
412+
410413
* Tue Oct 29 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.57.1-1
411414
- Auto-upgrade to 6.6.57.1
412415

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.aarch64.rpm
2-
kernel-headers-6.6.57.1-1.azl3.noarch.rpm
2+
kernel-headers-6.6.57.1-2.azl3.noarch.rpm
33
glibc-2.38-8.azl3.aarch64.rpm
44
glibc-devel-2.38-8.azl3.aarch64.rpm
55
glibc-i18n-2.38-8.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
filesystem-1.1-21.azl3.x86_64.rpm
2-
kernel-headers-6.6.57.1-1.azl3.noarch.rpm
2+
kernel-headers-6.6.57.1-2.azl3.noarch.rpm
33
glibc-2.38-8.azl3.x86_64.rpm
44
glibc-devel-2.38-8.azl3.x86_64.rpm
55
glibc-i18n-2.38-8.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ intltool-0.51.0-7.azl3.noarch.rpm
156156
itstool-2.0.7-1.azl3.noarch.rpm
157157
kbd-2.2.0-2.azl3.aarch64.rpm
158158
kbd-debuginfo-2.2.0-2.azl3.aarch64.rpm
159-
kernel-headers-6.6.57.1-1.azl3.noarch.rpm
159+
kernel-headers-6.6.57.1-2.azl3.noarch.rpm
160160
kmod-30-1.azl3.aarch64.rpm
161161
kmod-debuginfo-30-1.azl3.aarch64.rpm
162162
kmod-devel-30-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ intltool-0.51.0-7.azl3.noarch.rpm
161161
itstool-2.0.7-1.azl3.noarch.rpm
162162
kbd-2.2.0-2.azl3.x86_64.rpm
163163
kbd-debuginfo-2.2.0-2.azl3.x86_64.rpm
164-
kernel-cross-headers-6.6.57.1-1.azl3.noarch.rpm
165-
kernel-headers-6.6.57.1-1.azl3.noarch.rpm
164+
kernel-cross-headers-6.6.57.1-2.azl3.noarch.rpm
165+
kernel-headers-6.6.57.1-2.azl3.noarch.rpm
166166
kmod-30-1.azl3.x86_64.rpm
167167
kmod-debuginfo-30-1.azl3.x86_64.rpm
168168
kmod-devel-30-1.azl3.x86_64.rpm

0 commit comments

Comments
 (0)