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/64ca3b22598c391ddeef513bb1c5fb6731d9d6f6e38fd71c8ee3730030e599b7/kernel6.12-6.12.66-88.122.amzn2023.src.rpm"
sha512 = "06ef75493d9586b14a638654437719e6d390823b1128190caa1f3ecd6b10e6037c8c2948498b66e70d2d4f60a2182e7781e0df9ca16be4b90510e992c02db771"
url = "https://cdn.amazonlinux.com/al2023/blobstore/aa7ca944bcb6107a0840b7ef430a6cb3ddede1f2a477e94f5bbff3d47d879c9c/kernel6.12-6.12.68-92.122.amzn2023.src.rpm"
sha512 = "82a8d44eb2fbaba68b8005aaa6c4a3f5df08302b66c9bfe6bcef7d50a6f9dafd0741afd14b5febaed1d64f5d57b9c280172c1104d70226ab05692540a7c3f682"
force-upstream = true

[[package.metadata.build-package.external-files]]
Expand Down
26 changes: 23 additions & 3 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.66 Kernel Configuration
# Linux/arm64 6.12.68 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 @@ -2597,7 +2597,9 @@ CONFIG_IXGBEVF_IPSEC=y
CONFIG_I40E=m
# CONFIG_I40E_DCB is not set
# CONFIG_I40EVF is not set
# CONFIG_ICE is not set
CONFIG_ICE=m
CONFIG_ICE_HWMON=y
CONFIG_ICE_SWITCHDEV=y
# CONFIG_FM10K is not set
CONFIG_IGC=m
# CONFIG_IDPF is not set
Expand Down Expand Up @@ -2769,8 +2771,23 @@ CONFIG_MDIO_DEVRES=m
# CONFIG_PCS_XPCS is not set
# end of PCS device drivers

# CONFIG_PPP is not set
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_FILTER=y
CONFIG_PPP_MPPE=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPPOE=m
# CONFIG_PPPOE_HASH_BITS_1 is not set
# CONFIG_PPPOE_HASH_BITS_2 is not set
CONFIG_PPPOE_HASH_BITS_4=y
# CONFIG_PPPOE_HASH_BITS_8 is not set
CONFIG_PPPOE_HASH_BITS=4
# CONFIG_PPTP is not set
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
# CONFIG_SLIP is not set
CONFIG_SLHC=m

#
# Host-side USB support is needed for USB Network Adapter support
Expand Down Expand Up @@ -4531,6 +4548,7 @@ CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
CONFIG_INFINIBAND_VIRT_DMA=y
# CONFIG_INFINIBAND_EFA is not set
# CONFIG_INFINIBAND_ERDMA is not set
# CONFIG_INFINIBAND_IRDMA is not set
# CONFIG_MLX4_INFINIBAND is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_INFINIBAND_MTHCA is not set
Expand Down Expand Up @@ -5146,6 +5164,7 @@ CONFIG_PM_OPP=y
# CONFIG_PECI is not set
# CONFIG_HTE is not set
# CONFIG_CDX_BUS is not set
CONFIG_DPLL=y
CONFIG_AMAZON_DRIVER_UPDATES=y
CONFIG_AMAZON_ENA_ETHERNET=m
CONFIG_AMAZON_EFA_INFINIBAND=m
Expand Down Expand Up @@ -5978,6 +5997,7 @@ CONFIG_SBITMAP=y

CONFIG_GENERIC_IOREMAP=y
CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
CONFIG_PLDMFW=y
CONFIG_ASN1_ENCODER=m
CONFIG_FIRMWARE_TABLE=y

Expand Down
27 changes: 24 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.66 Kernel Configuration
# Linux/x86 6.12.68 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 @@ -2484,7 +2484,10 @@ CONFIG_IXGBEVF_IPSEC=y
CONFIG_I40E=m
# CONFIG_I40E_DCB is not set
# CONFIG_I40EVF is not set
# CONFIG_ICE is not set
CONFIG_ICE=m
CONFIG_ICE_HWMON=y
CONFIG_ICE_SWITCHDEV=y
CONFIG_ICE_HWTS=y
# CONFIG_FM10K is not set
CONFIG_IGC=m
# CONFIG_IDPF is not set
Expand Down Expand Up @@ -2640,8 +2643,23 @@ CONFIG_MDIO_DEVRES=m
# CONFIG_PCS_XPCS is not set
# end of PCS device drivers

# CONFIG_PPP is not set
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_FILTER=y
CONFIG_PPP_MPPE=m
CONFIG_PPP_MULTILINK=y
CONFIG_PPPOE=m
# CONFIG_PPPOE_HASH_BITS_1 is not set
# CONFIG_PPPOE_HASH_BITS_2 is not set
CONFIG_PPPOE_HASH_BITS_4=y
# CONFIG_PPPOE_HASH_BITS_8 is not set
CONFIG_PPPOE_HASH_BITS=4
# CONFIG_PPTP is not set
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
# CONFIG_SLIP is not set
CONFIG_SLHC=m

#
# Host-side USB support is needed for USB Network Adapter support
Expand Down Expand Up @@ -4129,6 +4147,7 @@ CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
CONFIG_INFINIBAND_VIRT_DMA=y
# CONFIG_INFINIBAND_EFA is not set
# CONFIG_INFINIBAND_ERDMA is not set
# CONFIG_INFINIBAND_IRDMA is not set
# CONFIG_MLX4_INFINIBAND is not set
CONFIG_MLX5_INFINIBAND=m
# CONFIG_INFINIBAND_MTHCA is not set
Expand Down Expand Up @@ -4713,6 +4732,7 @@ CONFIG_NVMEM_SYSFS=y
# CONFIG_MOST is not set
# CONFIG_PECI is not set
# CONFIG_HTE is not set
CONFIG_DPLL=y
CONFIG_AMAZON_DRIVER_UPDATES=y
CONFIG_AMAZON_ENA_ETHERNET=m
CONFIG_AMAZON_EFA_INFINIBAND=m
Expand Down Expand Up @@ -5537,6 +5557,7 @@ CONFIG_SBITMAP=y
# CONFIG_LWQ_TEST is not set
# end of Library routines

CONFIG_PLDMFW=y
CONFIG_ASN1_ENCODER=m
CONFIG_FIRMWARE_TABLE=y

Expand Down
14 changes: 12 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.66
Version: 6.12.68
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/64ca3b22598c391ddeef513bb1c5fb6731d9d6f6e38fd71c8ee3730030e599b7/kernel6.12-6.12.66-88.122.amzn2023.src.rpm
Source0: https://cdn.amazonlinux.com/al2023/blobstore/aa7ca944bcb6107a0840b7ef430a6cb3ddede1f2a477e94f5bbff3d47d879c9c/kernel6.12-6.12.68-92.122.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
Expand Down Expand Up @@ -809,6 +809,7 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/igb/igb.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/igc/igc.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/ice/ice.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/mellanox/mlxfw/mlxfw.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/realtek/r8169.%{_ko}
Expand All @@ -830,6 +831,15 @@ install -p -m 0644 %{S:301} %{buildroot}%{_cross_bootconfigdir}/05-vmware.conf
%{_cross_kmoddir}/kernel/drivers/net/netdevsim/netdevsim.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/net_failover.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/nlmon.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ppp/bsd_comp.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ppp/ppp_async.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ppp/ppp_deflate.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ppp/ppp_generic.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ppp/ppp_mppe.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ppp/ppp_synctty.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ppp/pppoe.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ppp/pppox.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/slip/slhc.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/phy/fixed_phy.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/phy/libphy.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/phy/mdio_devres.%{_ko}
Expand Down