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.18-microvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ path = "../packages.rs"
[[package.metadata.build-package.external-files]]
# Use latest-kernel-srpm-url.sh in packages/kernel-6.18 to get this. Keep this
# in sync with packages/kernel-6.18 so both kernels come from the same source.
url = "https://cdn.amazonlinux.com/al2023/blobstore/662a06f920092f6b37f28901fe034b0e63f6bfedf89d2eb4b2bb40455f53a0c6/kernel6.18-6.18.56-126.188.amzn2023.src.rpm"
sha512 = "1edc8b383705eb9a6a64fdbaa076a35ac33d90118fec4efec3f5e5bd142b31209ec093038c2c740510f50ebec1b01b937254dacfe23058c508a063d383bb9f1a"
url = "https://cdn.amazonlinux.com/al2023/blobstore/cbb9be49c69897a31d4ff653bf48ad68dc6a2e95df6c18c26cd92549c752c857/kernel6.18-6.18.62-127.179.amzn2023.src.rpm"
sha512 = "26d3a40486da10aea5f40dd830f2eb81db6343e9277124875976a09e4dd498f06d99853a343e94c163802a57a512e89e64ae02fd2b98fb6114677422879d4fff"
force-upstream = true

[build-dependencies]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.18.56 Kernel Configuration
# Linux/arm64 6.18.62 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2648,6 +2648,7 @@ CONFIG_NET_VENDOR_HISILICON=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_LIBETH=m
CONFIG_LIBETH_XDP=m
CONFIG_LIBIE=m
CONFIG_LIBIE_ADMINQ=m
CONFIG_LIBIE_FWLOG=m
Expand Down Expand Up @@ -3087,7 +3088,6 @@ CONFIG_TCG_TIS_SPI=y
# CONFIG_TCG_TIS_I2C_ATMEL is not set
# CONFIG_TCG_TIS_I2C_INFINEON is not set
# CONFIG_TCG_TIS_I2C_NUVOTON is not set
# CONFIG_TCG_ATMEL is not set
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_CRB=y
CONFIG_TCG_ARM_CRB_FFA=m
Expand Down Expand Up @@ -5679,7 +5679,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=y
# CONFIG_CRYPTO_KRB5ENC is not set
CONFIG_CRYPTO_KRB5ENC=m
CONFIG_CRYPTO_BENCHMARK=m
# end of Crypto core or helper

Expand Down Expand Up @@ -5873,7 +5873,8 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set
# end of Certificates for signature checking

# CONFIG_CRYPTO_KRB5 is not set
CONFIG_CRYPTO_KRB5=m
# CONFIG_CRYPTO_KRB5_SELFTESTS is not set
CONFIG_BINARY_PRINTF=y

#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.18.56 Kernel Configuration
# Linux/arm64 6.18.62 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2648,6 +2648,7 @@ CONFIG_NET_VENDOR_HISILICON=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_LIBETH=m
CONFIG_LIBETH_XDP=m
CONFIG_LIBIE=m
CONFIG_LIBIE_ADMINQ=m
CONFIG_LIBIE_FWLOG=m
Expand Down Expand Up @@ -3087,7 +3088,6 @@ CONFIG_TCG_TIS_SPI=y
# CONFIG_TCG_TIS_I2C_ATMEL is not set
# CONFIG_TCG_TIS_I2C_INFINEON is not set
# CONFIG_TCG_TIS_I2C_NUVOTON is not set
# CONFIG_TCG_ATMEL is not set
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_CRB=y
CONFIG_TCG_ARM_CRB_FFA=m
Expand Down Expand Up @@ -5679,7 +5679,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=y
# CONFIG_CRYPTO_KRB5ENC is not set
CONFIG_CRYPTO_KRB5ENC=m
CONFIG_CRYPTO_BENCHMARK=m
# end of Crypto core or helper

Expand Down Expand Up @@ -5873,7 +5873,8 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set
# end of Certificates for signature checking

# CONFIG_CRYPTO_KRB5 is not set
CONFIG_CRYPTO_KRB5=m
# CONFIG_CRYPTO_KRB5_SELFTESTS is not set
CONFIG_BINARY_PRINTF=y

#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.18.56 Kernel Configuration
# Linux/x86 6.18.62 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2540,6 +2540,7 @@ CONFIG_NET_VENDOR_HISILICON=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_LIBETH=m
CONFIG_LIBETH_XDP=m
CONFIG_LIBIE=m
CONFIG_LIBIE_ADMINQ=m
CONFIG_LIBIE_FWLOG=m
Expand Down Expand Up @@ -5271,7 +5272,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_CRYPTD=y
CONFIG_CRYPTO_AUTHENC=y
# CONFIG_CRYPTO_KRB5ENC is not set
CONFIG_CRYPTO_KRB5ENC=m
CONFIG_CRYPTO_BENCHMARK=m
# end of Crypto core or helper

Expand Down Expand Up @@ -5472,7 +5473,8 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set
# end of Certificates for signature checking

# CONFIG_CRYPTO_KRB5 is not set
CONFIG_CRYPTO_KRB5=m
# CONFIG_CRYPTO_KRB5_SELFTESTS is not set
CONFIG_BINARY_PRINTF=y

#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.18.56 Kernel Configuration
# Linux/x86 6.18.62 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2542,6 +2542,7 @@ CONFIG_NET_VENDOR_HISILICON=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_LIBETH=m
CONFIG_LIBETH_XDP=m
CONFIG_LIBIE=m
CONFIG_LIBIE_ADMINQ=m
CONFIG_LIBIE_FWLOG=m
Expand Down Expand Up @@ -5273,7 +5274,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_CRYPTD=y
CONFIG_CRYPTO_AUTHENC=y
# CONFIG_CRYPTO_KRB5ENC is not set
CONFIG_CRYPTO_KRB5ENC=m
CONFIG_CRYPTO_BENCHMARK=m
# end of Crypto core or helper

Expand Down Expand Up @@ -5474,7 +5475,8 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set
# end of Certificates for signature checking

# CONFIG_CRYPTO_KRB5 is not set
CONFIG_CRYPTO_KRB5=m
# CONFIG_CRYPTO_KRB5_SELFTESTS is not set
CONFIG_BINARY_PRINTF=y

#
Expand Down
7 changes: 5 additions & 2 deletions packages/kernel-6.18-microvm/kernel-6.18-microvm.spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
%global host_arch %(uname -m)

Name: %{_cross_os}kernel-%{kmajor}-microvm
Version: 6.18.56
Version: 6.18.62
Release: 1%{?dist}
Summary: The Linux kernel, configured for microvm guests
License: GPL-2.0 WITH Linux-syscall-note
URL: https://www.kernel.org/
# Keep this in sync with packages/kernel-6.18 so both kernels are built from the
# same source. Use that package's latest-kernel-srpm-url.sh to get this.
Source0: https://cdn.amazonlinux.com/al2023/blobstore/662a06f920092f6b37f28901fe034b0e63f6bfedf89d2eb4b2bb40455f53a0c6/kernel6.18-6.18.56-126.188.amzn2023.src.rpm
Source0: https://cdn.amazonlinux.com/al2023/blobstore/cbb9be49c69897a31d4ff653bf48ad68dc6a2e95df6c18c26cd92549c752c857/kernel6.18-6.18.62-127.179.amzn2023.src.rpm
Source1: gpgkey-B21C50FA44A99720EAA72F7FE951904AD832C631.asc

# Overrides that make this kernel bootable as a microvm guest.
Expand Down Expand Up @@ -461,6 +461,8 @@ install -p -m 0644 %{S:300} %{buildroot}%{_cross_bootconfigdir}/05-aws.conf
%{_cross_kmoddir}/kernel/crypto/fcrypt.%{_ko}
%{_cross_kmoddir}/kernel/crypto/fips140/fips140.%{_ko}
%{_cross_kmoddir}/kernel/crypto/khazad.%{_ko}
%{_cross_kmoddir}/kernel/crypto/krb5/krb5.%{_ko}
%{_cross_kmoddir}/kernel/crypto/krb5enc.%{_ko}
%{_cross_kmoddir}/kernel/crypto/lrw.%{_ko}
%{_cross_kmoddir}/kernel/crypto/lz4.%{_ko}
%{_cross_kmoddir}/kernel/crypto/lz4hc.%{_ko}
Expand Down Expand Up @@ -580,6 +582,7 @@ install -p -m 0644 %{S:300} %{buildroot}%{_cross_bootconfigdir}/05-aws.conf
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/libeth/libeth.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/libeth/libeth_xdp.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/libie/libie.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/libie/libie_adminq.%{_ko}
%{_cross_kmoddir}/kernel/drivers/net/ethernet/intel/libie/libie_fwlog.%{_ko}
Expand Down
4 changes: 2 additions & 2 deletions packages/kernel-6.18/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,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/662a06f920092f6b37f28901fe034b0e63f6bfedf89d2eb4b2bb40455f53a0c6/kernel6.18-6.18.56-126.188.amzn2023.src.rpm"
sha512 = "1edc8b383705eb9a6a64fdbaa076a35ac33d90118fec4efec3f5e5bd142b31209ec093038c2c740510f50ebec1b01b937254dacfe23058c508a063d383bb9f1a"
url = "https://cdn.amazonlinux.com/al2023/blobstore/cbb9be49c69897a31d4ff653bf48ad68dc6a2e95df6c18c26cd92549c752c857/kernel6.18-6.18.62-127.179.amzn2023.src.rpm"
sha512 = "26d3a40486da10aea5f40dd830f2eb81db6343e9277124875976a09e4dd498f06d99853a343e94c163802a57a512e89e64ae02fd2b98fb6114677422879d4fff"
force-upstream = true


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.18.56 Kernel Configuration
# Linux/arm64 6.18.62 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2661,6 +2661,7 @@ CONFIG_NET_VENDOR_HISILICON=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_LIBETH=m
CONFIG_LIBETH_XDP=m
CONFIG_LIBIE=m
CONFIG_LIBIE_ADMINQ=m
CONFIG_LIBIE_FWLOG=m
Expand Down Expand Up @@ -3099,7 +3100,6 @@ CONFIG_TCG_TIS_SPI=y
# CONFIG_TCG_TIS_I2C_ATMEL is not set
# CONFIG_TCG_TIS_I2C_INFINEON is not set
# CONFIG_TCG_TIS_I2C_NUVOTON is not set
# CONFIG_TCG_ATMEL is not set
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_CRB=y
CONFIG_TCG_ARM_CRB_FFA=m
Expand Down Expand Up @@ -5770,7 +5770,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
# CONFIG_CRYPTO_KRB5ENC is not set
CONFIG_CRYPTO_KRB5ENC=m
CONFIG_CRYPTO_BENCHMARK=m
# end of Crypto core or helper

Expand Down Expand Up @@ -5965,7 +5965,8 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set
# end of Certificates for signature checking

# CONFIG_CRYPTO_KRB5 is not set
CONFIG_CRYPTO_KRB5=m
# CONFIG_CRYPTO_KRB5_SELFTESTS is not set
CONFIG_BINARY_PRINTF=y

#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.18.56 Kernel Configuration
# Linux/arm64 6.18.62 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2661,6 +2661,7 @@ CONFIG_NET_VENDOR_HISILICON=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_LIBETH=m
CONFIG_LIBETH_XDP=m
CONFIG_LIBIE=m
CONFIG_LIBIE_ADMINQ=m
CONFIG_LIBIE_FWLOG=m
Expand Down Expand Up @@ -3099,7 +3100,6 @@ CONFIG_TCG_TIS_SPI=y
# CONFIG_TCG_TIS_I2C_ATMEL is not set
# CONFIG_TCG_TIS_I2C_INFINEON is not set
# CONFIG_TCG_TIS_I2C_NUVOTON is not set
# CONFIG_TCG_ATMEL is not set
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_CRB=y
CONFIG_TCG_ARM_CRB_FFA=m
Expand Down Expand Up @@ -5770,7 +5770,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
# CONFIG_CRYPTO_KRB5ENC is not set
CONFIG_CRYPTO_KRB5ENC=m
CONFIG_CRYPTO_BENCHMARK=m
# end of Crypto core or helper

Expand Down Expand Up @@ -5965,7 +5965,8 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set
# end of Certificates for signature checking

# CONFIG_CRYPTO_KRB5 is not set
CONFIG_CRYPTO_KRB5=m
# CONFIG_CRYPTO_KRB5_SELFTESTS is not set
CONFIG_BINARY_PRINTF=y

#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.18.56 Kernel Configuration
# Linux/x86 6.18.62 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2556,6 +2556,7 @@ CONFIG_NET_VENDOR_HISILICON=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_LIBETH=m
CONFIG_LIBETH_XDP=m
CONFIG_LIBIE=m
CONFIG_LIBIE_ADMINQ=m
CONFIG_LIBIE_FWLOG=m
Expand Down Expand Up @@ -5367,7 +5368,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_CRYPTD=y
CONFIG_CRYPTO_AUTHENC=m
# CONFIG_CRYPTO_KRB5ENC is not set
CONFIG_CRYPTO_KRB5ENC=m
CONFIG_CRYPTO_BENCHMARK=m
# end of Crypto core or helper

Expand Down Expand Up @@ -5568,7 +5569,8 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set
# end of Certificates for signature checking

# CONFIG_CRYPTO_KRB5 is not set
CONFIG_CRYPTO_KRB5=m
# CONFIG_CRYPTO_KRB5_SELFTESTS is not set
CONFIG_BINARY_PRINTF=y

#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.18.56 Kernel Configuration
# Linux/x86 6.18.62 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="x86_64-bottlerocket-linux-gnu-gcc (Buildroot 2025.05.1) 13.4.0"
CONFIG_CC_IS_GCC=y
Expand Down Expand Up @@ -2558,6 +2558,7 @@ CONFIG_NET_VENDOR_HISILICON=y
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_INTEL=y
CONFIG_LIBETH=m
CONFIG_LIBETH_XDP=m
CONFIG_LIBIE=m
CONFIG_LIBIE_ADMINQ=m
CONFIG_LIBIE_FWLOG=m
Expand Down Expand Up @@ -5369,7 +5370,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_CRYPTD=y
CONFIG_CRYPTO_AUTHENC=m
# CONFIG_CRYPTO_KRB5ENC is not set
CONFIG_CRYPTO_KRB5ENC=m
CONFIG_CRYPTO_BENCHMARK=m
# end of Crypto core or helper

Expand Down Expand Up @@ -5570,7 +5571,8 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set
# end of Certificates for signature checking

# CONFIG_CRYPTO_KRB5 is not set
CONFIG_CRYPTO_KRB5=m
# CONFIG_CRYPTO_KRB5_SELFTESTS is not set
CONFIG_BINARY_PRINTF=y

#
Expand Down
Loading
Loading