Skip to content

Commit 01d111f

Browse files
authored
Merge pull request #301 from bottlerocket-os/update_2025-10-27_6.12
kernel-6.12 : update to 6.12.53-69.119
2 parents 25f5a33 + 07d5dfa commit 01d111f

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

packages/kernel-6.12/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ path = "../packages.rs"
1313

1414
[[package.metadata.build-package.external-files]]
1515
# Use latest-kernel-srpm-url.sh to get this.
16-
url = "https://cdn.amazonlinux.com/al2023/blobstore/90e970acea5d658008c0707a6c4953b0e877f85b122cd967525bfecb043af96b/kernel6.12-6.12.46-66.121.amzn2023.src.rpm"
17-
sha512 = "ca7fc22f52e6d0c29d02ed2d51636a63e460d4ec5f2ac49a2cd0ad901af1031ff5741fc54c91388572b03518a250f9901ed68ad9650e37a6abb655e1277239a6"
16+
url = "https://cdn.amazonlinux.com/al2023/blobstore/49d5661cf5235c5087bc00b20150ad73bc13d59ed112111993f9d658d2537e8e/kernel6.12-6.12.53-69.119.amzn2023.src.rpm"
17+
sha512 = "58fdaad3f9ad80385eff1dc99e5e0ad7eb18fc6f22446b8ff5bfc9368bd2bb8ab676a050ceb747ff74f9ba6b7e2a45cb1bd8d27a664ac8d0e9517adb9990ec78"
1818
force-upstream = true
1919

2020
[[package.metadata.build-package.external-files]]

packages/kernel-6.12/config-full-bottlerocket-aarch64

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/arm64 6.12.46 Kernel Configuration
3+
# Linux/arm64 6.12.53 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -859,8 +859,6 @@ CONFIG_GCC_PLUGINS=y
859859
CONFIG_FUNCTION_ALIGNMENT_4B=y
860860
CONFIG_FUNCTION_ALIGNMENT_8B=y
861861
CONFIG_FUNCTION_ALIGNMENT=8
862-
CONFIG_AS_HAS_SFRAME_SUPPORT=y
863-
CONFIG_SFRAME_UNWIND_TABLE=y
864862
# end of General architecture-dependent options
865863

866864
CONFIG_RT_MUTEXES=y
@@ -6241,7 +6239,6 @@ CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y
62416239
# CONFIG_PID_IN_CONTEXTIDR is not set
62426240
# CONFIG_DEBUG_EFI is not set
62436241
# CONFIG_ARM64_RELOC_TEST is not set
6244-
CONFIG_SFRAME_UNWINDER=y
62456242
# CONFIG_CORESIGHT is not set
62466243
# end of arm64 Debugging
62476244

packages/kernel-6.12/config-full-bottlerocket-x86_64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Linux/x86 6.12.46 Kernel Configuration
3+
# Linux/x86 6.12.53 Kernel Configuration
44
#
55
CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0"
66
CONFIG_CC_IS_GCC=y
@@ -569,6 +569,7 @@ CONFIG_MITIGATION_SRBDS=y
569569
CONFIG_MITIGATION_SSB=y
570570
CONFIG_MITIGATION_ITS=y
571571
CONFIG_MITIGATION_TSA=y
572+
CONFIG_MITIGATION_VMSCAPE=y
572573
CONFIG_ARCH_HAS_ADD_PAGES=y
573574

574575
#
@@ -932,7 +933,6 @@ CONFIG_GCC_PLUGINS=y
932933
CONFIG_FUNCTION_ALIGNMENT_4B=y
933934
CONFIG_FUNCTION_ALIGNMENT_16B=y
934935
CONFIG_FUNCTION_ALIGNMENT=16
935-
CONFIG_AS_HAS_SFRAME_SUPPORT=y
936936
# end of General architecture-dependent options
937937

938938
CONFIG_RT_MUTEXES=y

packages/kernel-6.12/kernel-6.12.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
%global kmajor 6.12
55

66
Name: %{_cross_os}kernel-%{kmajor}
7-
Version: 6.12.46
7+
Version: 6.12.53
88
Release: 1%{?dist}
99
Summary: The Linux kernel
1010
License: GPL-2.0 WITH Linux-syscall-note
1111
URL: https://www.kernel.org/
1212
# Use latest-kernel-srpm-url.sh to get this.
13-
Source0: https://cdn.amazonlinux.com/al2023/blobstore/90e970acea5d658008c0707a6c4953b0e877f85b122cd967525bfecb043af96b/kernel6.12-6.12.46-66.121.amzn2023.src.rpm
13+
Source0: https://cdn.amazonlinux.com/al2023/blobstore/49d5661cf5235c5087bc00b20150ad73bc13d59ed112111993f9d658d2537e8e/kernel6.12-6.12.53-69.119.amzn2023.src.rpm
1414
Source1: gpgkey-B21C50FA44A99720EAA72F7FE951904AD832C631.asc
1515
# Use latest-neuron-srpm-url.sh to get this.
1616
Source2: https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.21.37.0.noarch.rpm

0 commit comments

Comments
 (0)