From 257a48fc2f3c1f689574d45e1ef8139bfed95610 Mon Sep 17 00:00:00 2001 From: Leonard Foerster Date: Thu, 2 Nov 2023 15:55:43 +0000 Subject: [PATCH 1/5] kernel-5.10: update to 5.10.198 Rebase to Amazon Linux upstream version 5.10.198-187.748.amzn2. Signed-off-by: Leonard Foerster --- packages/kernel-5.10/Cargo.toml | 4 ++-- packages/kernel-5.10/kernel-5.10.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/kernel-5.10/Cargo.toml b/packages/kernel-5.10/Cargo.toml index 9b7664f4881..7faac1d0557 100644 --- a/packages/kernel-5.10/Cargo.toml +++ b/packages/kernel-5.10/Cargo.toml @@ -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/9f9ded8eec13c7cacb468496c899e93063db7800ad20b12d07c1fee60e05eb33/kernel-5.10.197-186.748.amzn2.src.rpm" -sha512 = "c5986ab33ef52cfe61a67e29db2856072cb68c525c69dc0be14efbba58ad7df9f9989ddad27ebd722088d6f01b58875b49bf1aed06901e3d9966c0fed95ba722" +url = "https://cdn.amazonlinux.com/blobstore/5c8155b74bb2980fed073710617014a21ad836d9b6aa2c1d39e9168289236fde/kernel-5.10.198-187.748.amzn2.src.rpm" +sha512 = "ae931ec40f8edd7cf76dfc10e7f6e8719cf680e3aa4b65a4efaf37b3075b36d71f01cb28fa59f0e7a73eba7a41f6e0b753bd1eed2fda66563e7d6f2ac36394d5" [build-dependencies] microcode = { path = "../microcode" } diff --git a/packages/kernel-5.10/kernel-5.10.spec b/packages/kernel-5.10/kernel-5.10.spec index 89349680bcb..8e37e40e75c 100644 --- a/packages/kernel-5.10/kernel-5.10.spec +++ b/packages/kernel-5.10/kernel-5.10.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} Name: %{_cross_os}kernel-5.10 -Version: 5.10.197 +Version: 5.10.198 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/9f9ded8eec13c7cacb468496c899e93063db7800ad20b12d07c1fee60e05eb33/kernel-5.10.197-186.748.amzn2.src.rpm +Source0: https://cdn.amazonlinux.com/blobstore/5c8155b74bb2980fed073710617014a21ad836d9b6aa2c1d39e9168289236fde/kernel-5.10.198-187.748.amzn2.src.rpm Source100: config-bottlerocket Source101: config-bottlerocket-aws Source102: config-bottlerocket-metal From 35e128b848a33fdcf60619617593541f7d5cc2bc Mon Sep 17 00:00:00 2001 From: Leonard Foerster Date: Thu, 2 Nov 2023 15:56:21 +0000 Subject: [PATCH 2/5] kernel-5.15: update to 5.15.136 Rebase to Amazon Linux upstream version 5.15.136-90.144.amzn2. Signed-off-by: Leonard Foerster --- packages/kernel-5.15/Cargo.toml | 4 ++-- packages/kernel-5.15/kernel-5.15.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/kernel-5.15/Cargo.toml b/packages/kernel-5.15/Cargo.toml index 9b1a4169ce2..cada059a76e 100644 --- a/packages/kernel-5.15/Cargo.toml +++ b/packages/kernel-5.15/Cargo.toml @@ -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/418a9aab17cff76bb9577affa1df20b27fa223168e2fafef62510de157e1957d/kernel-5.15.134-87.145.amzn2.src.rpm" -sha512 = "fdc386b82928c7a29bbdbf0ff0c55e22a36f03d725aedfe8d6d309628e79484d2743ec00322713009fb2a56c49e1c20f3938fef7075215c76028b00f3149bdad" +url = "https://cdn.amazonlinux.com/blobstore/8bbf53203badda16f39f6dabe8974acac6f4b3d0dcf96378a434a32c897da379/kernel-5.15.136-90.144.amzn2.src.rpm" +sha512 = "5f1cf5c446a96805f54f8e38a32d779782e510af0c4efe5015d07d3d5606216410939f883c7769f9faede67d77e4d9fc3a2ba4a9251a150417ce1a2283304066" [build-dependencies] microcode = { path = "../microcode" } diff --git a/packages/kernel-5.15/kernel-5.15.spec b/packages/kernel-5.15/kernel-5.15.spec index ddc3ffae44c..52a5e29d6cb 100644 --- a/packages/kernel-5.15/kernel-5.15.spec +++ b/packages/kernel-5.15/kernel-5.15.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} Name: %{_cross_os}kernel-5.15 -Version: 5.15.134 +Version: 5.15.136 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/418a9aab17cff76bb9577affa1df20b27fa223168e2fafef62510de157e1957d/kernel-5.15.134-87.145.amzn2.src.rpm +Source0: https://cdn.amazonlinux.com/blobstore/8bbf53203badda16f39f6dabe8974acac6f4b3d0dcf96378a434a32c897da379/kernel-5.15.136-90.144.amzn2.src.rpm Source100: config-bottlerocket Source101: config-bottlerocket-aws Source102: config-bottlerocket-metal From 2ce6f9f40d926d55af6fcac8e09b1d0a40d231fa Mon Sep 17 00:00:00 2001 From: Leonard Foerster Date: Thu, 2 Nov 2023 15:57:23 +0000 Subject: [PATCH 3/5] kernel-6.1: update to 6.1.56 Rebase to Amazon Linux upstream version 6.1.56-82.125.amzn2023. Signed-off-by: Leonard Foerster --- packages/kernel-6.1/Cargo.toml | 4 ++-- packages/kernel-6.1/kernel-6.1.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/kernel-6.1/Cargo.toml b/packages/kernel-6.1/Cargo.toml index 0825db0e730..058ae68bbf8 100644 --- a/packages/kernel-6.1/Cargo.toml +++ b/packages/kernel-6.1/Cargo.toml @@ -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/al2023/blobstore/b857edbf6e8d7c005d0e6e25d052548bb4a1113e504b6d2f50357998d94f9d07/kernel-6.1.55-75.123.amzn2023.src.rpm" -sha512 = "b87a14ab06804d1574a5a9b91df0749be4e22af5531a45b1bd2933656f92ac3688ea36adb06dd440234eb82f2c6139351a0efa1efa95259d151f91b3c242b67d" +url = "https://cdn.amazonlinux.com/al2023/blobstore/4c8745cd575d4358f74f7088fcfb66ec0026d3cf812356255425847141782ab4/kernel-6.1.56-82.125.amzn2023.src.rpm" +sha512 = "6b152f9e2e14b99fb7a88a45cb369db330165355e679a536e182bcf3c53cf23a1e3dd46703971dc32d34f757aaabacbc8fed6eaf57bfe6b3ac68ec0c4b1a31c0" [build-dependencies] microcode = { path = "../microcode" } diff --git a/packages/kernel-6.1/kernel-6.1.spec b/packages/kernel-6.1/kernel-6.1.spec index b239587f5ac..e5763d17512 100644 --- a/packages/kernel-6.1/kernel-6.1.spec +++ b/packages/kernel-6.1/kernel-6.1.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} Name: %{_cross_os}kernel-6.1 -Version: 6.1.55 +Version: 6.1.56 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/al2023/blobstore/b857edbf6e8d7c005d0e6e25d052548bb4a1113e504b6d2f50357998d94f9d07/kernel-6.1.55-75.123.amzn2023.src.rpm +Source0: https://cdn.amazonlinux.com/al2023/blobstore/4c8745cd575d4358f74f7088fcfb66ec0026d3cf812356255425847141782ab4/kernel-6.1.56-82.125.amzn2023.src.rpm Source100: config-bottlerocket Source101: config-bottlerocket-aws Source102: config-bottlerocket-metal From 938a6c7da915f1d08f7843d80b9f36d79a1d7649 Mon Sep 17 00:00:00 2001 From: Leonard Foerster Date: Fri, 3 Nov 2023 12:26:14 +0000 Subject: [PATCH 4/5] kernel-6.1: Remove unnecessary drivers Amazon Linux added these classes of drivers (atkeyboard, ps2 mouse, basic framebuffer) for usage in development setups. For Bottlerocket we do not need them in the generic case. On platforms where we need some of these drivers (metal, vmware) we have explicitly enabled them already. Signed-off-by: Leonard Foerster --- packages/kernel-6.1/config-bottlerocket | 11 +++++++++++ packages/kernel-6.1/config-bottlerocket-metal | 1 + 2 files changed, 12 insertions(+) diff --git a/packages/kernel-6.1/config-bottlerocket b/packages/kernel-6.1/config-bottlerocket index f95e720c73f..000efd66e84 100644 --- a/packages/kernel-6.1/config-bottlerocket +++ b/packages/kernel-6.1/config-bottlerocket @@ -193,3 +193,14 @@ CONFIG_ISCSI_TARGET=m # Disable DAMON subsystem. We currently do not have a good use-case for DAMON. # CONFIG_DAMON is not set + +# Disable unnecessary keyboard and mouse drivers. +# CONFIG_MOUSE_PS2 is not set +# CONFIG_SERIO is not set +# CONFIG_KEYBOARD_ATKBD is not set + +# Disable unnecessary framebuffer/drm drivers +# CONFIG_DRM_BOCHS is not set +# CONFIG_DRM_SIMPLEDRM is not set +# CONFIG_SYSFB_SIMPLEFB is not set + diff --git a/packages/kernel-6.1/config-bottlerocket-metal b/packages/kernel-6.1/config-bottlerocket-metal index 94d46c915ab..72f4a63d343 100644 --- a/packages/kernel-6.1/config-bottlerocket-metal +++ b/packages/kernel-6.1/config-bottlerocket-metal @@ -141,6 +141,7 @@ CONFIG_MOUSE_PS2=m # CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set # CONFIG_MOUSE_PS2_FOCALTECH is not set +# CONFIG_MOUSE_PS2_VMMOUSE is not set # Intel Volume Management Device driver, to support boot disks in a separate # PCI domain. From 0c10134f72b236587f538f4337dc6ddeb0845f12 Mon Sep 17 00:00:00 2001 From: Leonard Foerster Date: Mon, 6 Nov 2023 13:08:44 +0000 Subject: [PATCH 5/5] kernel-6.1: update to 6.1.59 Rebase to Amazon Linux upstream version 6.1.59-84.139.amzn2023. Signed-off-by: Leonard Foerster --- packages/kernel-6.1/Cargo.toml | 4 ++-- packages/kernel-6.1/kernel-6.1.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/kernel-6.1/Cargo.toml b/packages/kernel-6.1/Cargo.toml index 058ae68bbf8..ec016baab89 100644 --- a/packages/kernel-6.1/Cargo.toml +++ b/packages/kernel-6.1/Cargo.toml @@ -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/al2023/blobstore/4c8745cd575d4358f74f7088fcfb66ec0026d3cf812356255425847141782ab4/kernel-6.1.56-82.125.amzn2023.src.rpm" -sha512 = "6b152f9e2e14b99fb7a88a45cb369db330165355e679a536e182bcf3c53cf23a1e3dd46703971dc32d34f757aaabacbc8fed6eaf57bfe6b3ac68ec0c4b1a31c0" +url = "https://cdn.amazonlinux.com/al2023/blobstore/7f6b70d0766761e79bb6dae9a840ac4fb6ca95c78dad994ea97abac37dd2a061/kernel-6.1.59-84.139.amzn2023.src.rpm" +sha512 = "9e5c3dab3583742254775c82710007360da8d1a0b252f2acb9096788f6ed33d04599ef61bffc489f78540a4f8194440e79aa3e9ff25ae3be802973ade868bfb1" [build-dependencies] microcode = { path = "../microcode" } diff --git a/packages/kernel-6.1/kernel-6.1.spec b/packages/kernel-6.1/kernel-6.1.spec index e5763d17512..dc2c7025111 100644 --- a/packages/kernel-6.1/kernel-6.1.spec +++ b/packages/kernel-6.1/kernel-6.1.spec @@ -1,13 +1,13 @@ %global debug_package %{nil} Name: %{_cross_os}kernel-6.1 -Version: 6.1.56 +Version: 6.1.59 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/al2023/blobstore/4c8745cd575d4358f74f7088fcfb66ec0026d3cf812356255425847141782ab4/kernel-6.1.56-82.125.amzn2023.src.rpm +Source0: https://cdn.amazonlinux.com/al2023/blobstore/7f6b70d0766761e79bb6dae9a840ac4fb6ca95c78dad994ea97abac37dd2a061/kernel-6.1.59-84.139.amzn2023.src.rpm Source100: config-bottlerocket Source101: config-bottlerocket-aws Source102: config-bottlerocket-metal