Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/kernel-6.12/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/545853ad31318a391c4d62347bca6060c1a31f8f9765322793d7322aaa58ebb8/kernel6.12-6.12.35-55.103.amzn2023.src.rpm"
sha512 = "19bbbbab376e02f7f5de284571679863cc0f78121f232d0557d05e48b24b13707122dd3b9616f59b0e1e119cbbfd04267bd99ef9fe6852360b048b0fdec9eae2"
url = "https://cdn.amazonlinux.com/al2023/blobstore/ce5ad35d1c33c79e01a6202cc296334941982074afe0962ec160e35864ea5552/kernel6.12-6.12.37-61.105.amzn2023.src.rpm"
sha512 = "fec2dfa7af6a66c4c8b7369f7d9c727f83d9ab43c79d136fff4a93f7d6beceb749a2f370255fd593b0554897304045a17c0af1bc096774b99dc21d927824de74"
force-upstream = true

[[package.metadata.build-package.external-files]]
Expand Down
7 changes: 5 additions & 2 deletions packages/kernel-6.12/config-full-bottlerocket-aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.12.35 Kernel Configuration
# Linux/arm64 6.12.37 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -1159,7 +1159,10 @@ CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
CONFIG_USERFAULTFD=y
CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_LRU_GEN is not set
CONFIG_LRU_GEN=y
# CONFIG_LRU_GEN_ENABLED is not set
# CONFIG_LRU_GEN_STATS is not set
CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
Expand Down
12 changes: 9 additions & 3 deletions packages/kernel-6.12/config-full-bottlerocket-x86_64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.12.35 Kernel Configuration
# Linux/x86 6.12.37 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2024.11.1) 13.3.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -568,6 +568,7 @@ CONFIG_MITIGATION_SPECTRE_V2=y
CONFIG_MITIGATION_SRBDS=y
CONFIG_MITIGATION_SSB=y
CONFIG_MITIGATION_ITS=y
CONFIG_MITIGATION_TSA=y
CONFIG_ARCH_HAS_ADD_PAGES=y

#
Expand Down Expand Up @@ -1171,14 +1172,18 @@ CONFIG_PERCPU_STATS=y
# CONFIG_GUP_TEST is not set
# CONFIG_DMAPOOL_TEST is not set
CONFIG_ARCH_HAS_PTE_SPECIAL=y
CONFIG_MAPPING_DIRTY_HELPERS=y
CONFIG_MEMFD_CREATE=y
CONFIG_SECRETMEM=y
# CONFIG_ANON_VMA_NAME is not set
CONFIG_HAVE_ARCH_USERFAULTFD_WP=y
CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y
CONFIG_USERFAULTFD=y
CONFIG_PTE_MARKER_UFFD_WP=y
# CONFIG_LRU_GEN is not set
CONFIG_LRU_GEN=y
# CONFIG_LRU_GEN_ENABLED is not set
# CONFIG_LRU_GEN_STATS is not set
CONFIG_LRU_GEN_WALKS_MMU=y
CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y
CONFIG_PER_VMA_LOCK=y
CONFIG_LOCK_MM_AND_FIND_VMA=y
Expand Down Expand Up @@ -3533,7 +3538,8 @@ CONFIG_DRM_SUBALLOC_HELPER=m
# CONFIG_DRM_XE is not set
# CONFIG_DRM_VGEM is not set
# CONFIG_DRM_VKMS is not set
# CONFIG_DRM_VMWGFX is not set
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_GMA500 is not set
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_AST is not set
Expand Down
9 changes: 7 additions & 2 deletions packages/kernel-6.12/kernel-6.12.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
%global kmajor 6.12

Name: %{_cross_os}kernel-%{kmajor}
Version: 6.12.35
Version: 6.12.37
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/545853ad31318a391c4d62347bca6060c1a31f8f9765322793d7322aaa58ebb8/kernel6.12-6.12.35-55.103.amzn2023.src.rpm
Source0: https://cdn.amazonlinux.com/al2023/blobstore/ce5ad35d1c33c79e01a6202cc296334941982074afe0962ec160e35864ea5552/kernel6.12-6.12.37-61.105.amzn2023.src.rpm
Source1: gpgkey-B21C50FA44A99720EAA72F7FE951904AD832C631.asc
# Use latest-neuron-srpm-url.sh to get this.
Source2: https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.20.28.0.noarch.rpm
Expand Down Expand Up @@ -658,6 +658,11 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
%{_cross_kmoddir}/kernel/drivers/gpu/drm/tiny/simpledrm.%{_ko}
%{_cross_kmoddir}/kernel/drivers/gpu/drm/display/drm_display_helper.%{_ko}
%{_cross_kmoddir}/kernel/drivers/gpu/drm/ttm/ttm.%{_ko}

%if "%{_cross_arch}" == "x86_64"
%{_cross_kmoddir}/kernel/drivers/gpu/drm/vmwgfx/vmwgfx.%{_ko}
%endif

%{_cross_kmoddir}/kernel/drivers/hid/hid-generic.%{_ko}
%{_cross_kmoddir}/kernel/drivers/hid/hid-multitouch.%{_ko}
%{_cross_kmoddir}/kernel/drivers/hid/uhid.%{_ko}
Expand Down