Skip to content

Commit 7ee6efc

Browse files
committed
kernel-6.1: update to 6.1.109
Rebase to Amazon Linux upstream version 6.1.109-118.189.amzn2023. Adjust some of the modules to account for new configuration changes. Signed-off-by: Matthew Yeazel <yeazelm@amazon.com>
1 parent a53cf79 commit 7ee6efc

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

packages/kernel-6.1/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-srpm-url.sh to get this.
16-
url = "https://cdn.amazonlinux.com/al2023/blobstore/f578e84fd35abf2a86cbe79936f7d773eed3ca0202ac5fa049cf01879ce9bbe3/kernel-6.1.106-116.188.amzn2023.src.rpm"
17-
sha512 = "253f601c2df406697fe9cff2a4cbfc3fb4c098a2ea8f36b3a1ce21c7c7d207612e18422a8eb832e6f3e105a59bb62b12bba6fb2f603e7740665ae38a78292645"
16+
url = "https://cdn.amazonlinux.com/al2023/blobstore/60b1be96cb0d00c8998e26b855b51b54e1cc82a655bb47a1d4f51c5ffbdd3148/kernel-6.1.109-118.189.amzn2023.src.rpm"
17+
sha512 = "2a40b73e7fbc28f48b01e3d0f463e6c72660662ce498fc91c4727617201ed1714480d731c9e59e8de632cb829ba1dc6cf0a07838eb9b90e61a2b422cb17aae8b"
1818

1919
[build-dependencies]
2020
microcode = { path = "../microcode" }

packages/kernel-6.1/kernel-6.1.spec

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
%global debug_package %{nil}
22

33
Name: %{_cross_os}kernel-6.1
4-
Version: 6.1.106
4+
Version: 6.1.109
55
Release: 1%{?dist}
66
Summary: The Linux kernel
77
License: GPL-2.0 WITH Linux-syscall-note
88
URL: https://www.kernel.org/
99
# Use latest-srpm-url.sh to get this.
10-
Source0: https://cdn.amazonlinux.com/al2023/blobstore/f578e84fd35abf2a86cbe79936f7d773eed3ca0202ac5fa049cf01879ce9bbe3/kernel-6.1.106-116.188.amzn2023.src.rpm
10+
Source0: https://cdn.amazonlinux.com/al2023/blobstore/60b1be96cb0d00c8998e26b855b51b54e1cc82a655bb47a1d4f51c5ffbdd3148/kernel-6.1.109-118.189.amzn2023.src.rpm
1111
Source100: config-bottlerocket
1212

1313
# This list of FIPS modules is extracted from /etc/fipsmodules in the initramfs
@@ -376,7 +376,6 @@ install -p -m 0644 %{S:302} %{buildroot}%{_cross_bootconfigdir}/05-metal.conf
376376
%{_cross_kmoddir}/System.map
377377

378378
%if "%{_cross_arch}" == "x86_64"
379-
%{_cross_kmoddir}/kernel/arch/x86/crypto/aesni-intel.ko.*
380379
%{_cross_kmoddir}/kernel/arch/x86/crypto/blowfish-x86_64.ko.*
381380
%{_cross_kmoddir}/kernel/arch/x86/crypto/camellia-aesni-avx2.ko.*
382381
%{_cross_kmoddir}/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko.*
@@ -451,7 +450,6 @@ install -p -m 0644 %{S:302} %{buildroot}%{_cross_bootconfigdir}/05-metal.conf
451450
%{_cross_kmoddir}/kernel/crypto/chacha_generic.ko.*
452451
%{_cross_kmoddir}/kernel/crypto/cmac.ko.*
453452
%{_cross_kmoddir}/kernel/crypto/crc32_generic.ko.*
454-
%{_cross_kmoddir}/kernel/crypto/cryptd.ko.*
455453
%{_cross_kmoddir}/kernel/crypto/crypto_user.ko.*
456454
%{_cross_kmoddir}/kernel/crypto/cts.ko.*
457455
%{_cross_kmoddir}/kernel/crypto/des_generic.ko.*
@@ -485,12 +483,10 @@ install -p -m 0644 %{S:302} %{buildroot}%{_cross_bootconfigdir}/05-metal.conf
485483
%{_cross_kmoddir}/kernel/crypto/xts.ko.*
486484
%{_cross_kmoddir}/kernel/crypto/xxhash_generic.ko.*
487485
%{_cross_kmoddir}/kernel/crypto/zstd.ko.*
488-
%if "%{_cross_arch}" == "x86_64"
489-
%{_cross_kmoddir}/kernel/crypto/crypto_simd.ko.*
490-
%endif
491486
%if "%{_cross_arch}" == "aarch64"
492487
%{_cross_kmoddir}/kernel/crypto/sm3.ko.*
493488
%{_cross_kmoddir}/kernel/crypto/sm4.ko.*
489+
%{_cross_kmoddir}/kernel/crypto/cryptd.ko.*
494490
%endif
495491
%{_cross_kmoddir}/kernel/drivers/acpi/ac.ko.*
496492
%{_cross_kmoddir}/kernel/drivers/acpi/button.ko.*
@@ -702,6 +698,7 @@ install -p -m 0644 %{S:302} %{buildroot}%{_cross_bootconfigdir}/05-metal.conf
702698
%{_cross_kmoddir}/kernel/drivers/pci/hotplug/acpiphp_ibm.ko.*
703699
%{_cross_kmoddir}/kernel/drivers/pci/pci-stub.ko.*
704700
%if "%{_cross_arch}" == "x86_64"
701+
%{_cross_kmoddir}/kernel/drivers/pci/controller/pci-hyperv-intf.ko.*
705702
%{_cross_kmoddir}/kernel/drivers/pci/hotplug/cpcihp_generic.ko.*
706703
%{_cross_kmoddir}/kernel/drivers/platform/x86/wmi-bmof.ko.*
707704
%{_cross_kmoddir}/kernel/drivers/platform/x86/wmi.ko.*
@@ -783,6 +780,7 @@ install -p -m 0644 %{S:302} %{buildroot}%{_cross_bootconfigdir}/05-metal.conf
783780
%{_cross_kmoddir}/kernel/drivers/usb/usbip/usbip-core.ko.*
784781
%{_cross_kmoddir}/kernel/drivers/usb/usbip/usbip-host.ko.*
785782
%{_cross_kmoddir}/kernel/drivers/usb/usbip/vhci-hcd.ko.*
783+
%{_cross_kmoddir}/kernel/drivers/vfio/pci/mlx5/mlx5-vfio-pci.ko.*
786784
%{_cross_kmoddir}/kernel/drivers/vfio/pci/vfio-pci-core.ko.*
787785
%{_cross_kmoddir}/kernel/drivers/vfio/pci/vfio-pci.ko.*
788786
%{_cross_kmoddir}/kernel/drivers/vfio/vfio_iommu_type1.ko.*

0 commit comments

Comments
 (0)