Merge pull request #352 from bottlerocket-os/update_2026-01-07_6.12

kernel-6.12 : update to 6.12.63-84.121

Author: yeazelm

packages/kernel-6.12/Cargo.toml

@@ -13,8 +13,8 @@ path = "../packages.rs"
 
 [[package.metadata.build-package.external-files]]
 # Use latest-kernel-srpm-url.sh to get this.
-url = "https://cdn.amazonlinux.com/al2023/blobstore/3e9759eca702bf9a4902cd326d929e749b574aea10e392b8429284bb9723a2e8/kernel6.12-6.12.58-82.121.amzn2023.src.rpm"
-sha512 = "c1938f2427b2e7050cb43780ccd2587650df310d3d8744fafe64adc5c115d57c893163227cf5fd481d82c441fc40eab2bf88fb42b5aa7eaaa3b5cea3c2be60eb"
+url = "https://cdn.amazonlinux.com/al2023/blobstore/dfcc7a8af184bf87478bb8d6e8b175f567c4b20185f66f2cc642bf88472807ee/kernel6.12-6.12.63-84.121.amzn2023.src.rpm"
+sha512 = "7b20b95f513cf82f92619367f5924a3dff7c91ef077e811460914db8dcb788d183fb2ea5c803c02f64fdf7e3d409b88100bb9d238f5bee97d802b0b2a044be53"
 force-upstream = true
 
 [[package.metadata.build-package.external-files]]

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

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.58 Kernel Configuration
+# Linux/arm64 6.12.63 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0"
 CONFIG_CC_IS_GCC=y
@@ -3126,6 +3126,7 @@ CONFIG_SPI_MEM=y
 # CONFIG_SPI_SN_F_OSPI is not set
 # CONFIG_SPI_MXIC is not set
 CONFIG_SPI_TEGRA210_QUAD=y
+# CONFIG_SPI_TEGRA114 is not set
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_THUNDERX is not set
 # CONFIG_SPI_XCOMM is not set

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

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.12.58 Kernel Configuration
+# Linux/x86 6.12.63 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0"
 CONFIG_CC_IS_GCC=y
@@ -3069,7 +3069,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
 # CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_K10TEMP is not set
+CONFIG_SENSORS_K10TEMP=m
 # CONFIG_SENSORS_FAM15H_POWER is not set
 # CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
@@ -3096,7 +3096,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_IBMAEM is not set
 # CONFIG_SENSORS_IBMPEX is not set
 # CONFIG_SENSORS_I5500 is not set
-# CONFIG_SENSORS_CORETEMP is not set
+CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
 # CONFIG_SENSORS_POWERZ is not set

packages/kernel-6.12/kernel-6.12.spec

@@ -4,13 +4,13 @@
 %global kmajor 6.12
 
 Name: %{_cross_os}kernel-%{kmajor}
-Version: 6.12.58
+Version: 6.12.63
 Release: 1%{?dist}
 Summary: The Linux kernel
 License: GPL-2.0 WITH Linux-syscall-note
 URL: https://www.kernel.org/
 # Use latest-kernel-srpm-url.sh to get this.
-Source0: https://cdn.amazonlinux.com/al2023/blobstore/3e9759eca702bf9a4902cd326d929e749b574aea10e392b8429284bb9723a2e8/kernel6.12-6.12.58-82.121.amzn2023.src.rpm
+Source0: https://cdn.amazonlinux.com/al2023/blobstore/dfcc7a8af184bf87478bb8d6e8b175f567c4b20185f66f2cc642bf88472807ee/kernel6.12-6.12.63-84.121.amzn2023.src.rpm
 Source1: gpgkey-B21C50FA44A99720EAA72F7FE951904AD832C631.asc
 # Use latest-2.21-neuron-srpm-url.sh to get this.
 Source2: https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.21.37.0.noarch.rpm
@@ -719,6 +719,10 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
 %endif
 %{_cross_kmoddir}/kernel/drivers/hwmon/acpi_power_meter.%{_ko}
 %{_cross_kmoddir}/kernel/drivers/hwmon/hwmon.%{_ko}
+%if "%{_cross_arch}" == "x86_64"
+%{_cross_kmoddir}/kernel/drivers/hwmon/coretemp.%{_ko}
+%{_cross_kmoddir}/kernel/drivers/hwmon/k10temp.%{_ko}
+%endif
 %{_cross_kmoddir}/kernel/drivers/i2c/algos/i2c-algo-bit.%{_ko}
 %if "%{_cross_arch}" == "x86_64"
 %{_cross_kmoddir}/kernel/drivers/i2c/busses/i2c-i801.%{_ko}