Skip to content

Commit

Permalink
kernel-5.15: update to 5.15.128
Browse files Browse the repository at this point in the history
Rebase to Amazon Linux upstream version 5.15.128-80.144.amzn2.

Drop downstream backports of fixes for CVE-2023-20588
as these are now included by the upstream base version.

Signed-off-by: Leonard Foerster <[email protected]>
  • Loading branch information
foersleo committed Sep 11, 2023
1 parent e7883c6 commit 5ef1612
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 251 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions packages/kernel-5.15/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-srpm-url.sh to get this.
url = "https://cdn.amazonlinux.com/blobstore/d73ac4b2ddb2c5ed91308adfcd7ccf4d7ba53882d31c9a6461e1661766159b62/kernel-5.15.122-77.145.amzn2.src.rpm"
sha512 = "37742f1923dcafa20e9144d9754e5238a85956bbb814caa89dbc4db2549e62b64c9e3af9ceaf0bc32d71560eef9a60d86f35ae3df86c5893094fd86b63b58ffb"
url = "https://cdn.amazonlinux.com/blobstore/d301b89106ee983f8cd5cd0b4d6b4111ea97b7e51ca2892a6d9bbec4eaf18c4f/kernel-5.15.128-80.144.amzn2.src.rpm"
sha512 = "ac8fce4c8f293dd123e64ec6f3cf553e2d9b0462de5b48e0caebeecb1091a6d72dde35571264da1ed05984845778e758552636faf42d89ac6af41feec1f8b5da"

[build-dependencies]
microcode = { path = "../microcode" }
10 changes: 2 additions & 8 deletions packages/kernel-5.15/kernel-5.15.spec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%global debug_package %{nil}

Name: %{_cross_os}kernel-5.15
Version: 5.15.122
Version: 5.15.128
Release: 1%{?dist}
Summary: The Linux kernel
License: GPL-2.0 WITH Linux-syscall-note
URL: https://www.kernel.org/
# Use latest-srpm-url.sh to get this.
Source0: https://cdn.amazonlinux.com/blobstore/d73ac4b2ddb2c5ed91308adfcd7ccf4d7ba53882d31c9a6461e1661766159b62/kernel-5.15.122-77.145.amzn2.src.rpm
Source0: https://cdn.amazonlinux.com/blobstore/d301b89106ee983f8cd5cd0b4d6b4111ea97b7e51ca2892a6d9bbec4eaf18c4f/kernel-5.15.128-80.144.amzn2.src.rpm
Source100: config-bottlerocket
Source101: config-bottlerocket-aws
Source102: config-bottlerocket-metal
Expand All @@ -22,12 +22,6 @@ Patch1003: 1003-initramfs-unlink-INITRAMFS_FORCE-from-CMDLINE_-EXTEN.patch
# Increase default of sysctl net.unix.max_dgram_qlen to 512.
Patch1004: 1004-af_unix-increase-default-max_dgram_qlen-to-512.patch

# Cherry-picked fixes for CVE-2023-20588 ("DIV0"). Can be dropped when moving
# upstream to 5.15.128 or later.
Patch5001: 5001-x86-bugs-Increase-the-x86-bugs-vector-size-to-two-u3.patch
Patch5002: 5002-x86-CPU-AMD-Do-not-leak-quotient-data-after-a-divisi.patch
Patch5003: 5003-x86-CPU-AMD-Fix-the-DIV-0-initial-fix-attempt.patch

BuildRequires: bc
BuildRequires: elfutils-devel
BuildRequires: hostname
Expand Down

0 comments on commit 5ef1612

Please sign in to comment.