From 8830c57dc63a0be208d28de88ab1c059a1c70ec6 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Thu, 7 Mar 2024 07:10:26 +0000 Subject: [PATCH 1/2] sys-kernel/coreos-sources: Update from 6.6.17 to 6.6.21 --- changelog/updates/2024-03-07-linux-6.6.21-update.md | 1 + ...{coreos-kernel-6.6.17.ebuild => coreos-kernel-6.6.21.ebuild} | 0 ...oreos-modules-6.6.17.ebuild => coreos-modules-6.6.21.ebuild} | 0 .../coreos-overlay/sys-kernel/coreos-sources/Manifest | 2 +- ...oreos-sources-6.6.17.ebuild => coreos-sources-6.6.21.ebuild} | 0 5 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/updates/2024-03-07-linux-6.6.21-update.md rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-6.6.17.ebuild => coreos-kernel-6.6.21.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-6.6.17.ebuild => coreos-modules-6.6.21.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-6.6.17.ebuild => coreos-sources-6.6.21.ebuild} (100%) diff --git a/changelog/updates/2024-03-07-linux-6.6.21-update.md b/changelog/updates/2024-03-07-linux-6.6.21-update.md new file mode 100644 index 00000000000..bce4e8bfca4 --- /dev/null +++ b/changelog/updates/2024-03-07-linux-6.6.21-update.md @@ -0,0 +1 @@ +- Linux ([6.6.21](https://lwn.net/Articles/964561) (includes [6.6.20](https://lwn.net/Articles/964307), [6.6.19](https://lwn.net/Articles/964173), [6.6.18](https://lwn.net/Articles/963357))) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.21.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.17.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.6.21.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.21.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.17.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.6.21.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index a92197d9dda..c9ffb4b1902 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 -DIST patch-6.6.17.xz 1123116 BLAKE2B 4f985a22e11257aadc0c0d78ebbc67778433ae46ebf9fe256986d252d33fb9369b0eab15926d6832cdf5f1d55fb31d8f04080b68fa082872f4faccd4b9a69270 SHA512 9dff20d8ea6e9b374ff3e43490f8171d143602b93d5ba55b8cbe3778a2474cba7ceb8f8da7c20a990bfb47095b7fa238e5b64be911cc57dc45c8c0dd34ca4055 +DIST patch-6.6.21.xz 1336272 BLAKE2B af67c4510431195fac48a4d1507bacc3eb3fbd455d5234cb54443287545ba913839bf795193e55969c1444e0021ddc8408e2e0c67f6063aa7ea56126f2e86bb1 SHA512 e7c8e640fc519d6c92cd13985a7e37d2c8fe0277b7386a9f861c39a6f164d815133b5fb02a691d43c7b79563b09d6ea78674af0ccecfef1b418f4d03bf52a9bc diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.21.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.17.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.21.ebuild From 7c23b298dbe1dc21bac539bd27c5ef5ae658e487 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 15 Mar 2024 11:52:37 +0100 Subject: [PATCH 2/2] sys-kernel/coreos-sources: Restore the section for the dm-verity hash This reverts the commit that removes the section where Flatcar has the dm-verity hash for /usr stored. In the future we might store it in the initrd or at the end of the bzImage. --- .../coreos-sources-6.6.21.ebuild | 1 + ...6-boot-Remove-the-bugger-off-message.patch | 103 ++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.6/z0003-Revert-x86-boot-Remove-the-bugger-off-message.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.21.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.21.ebuild index 6104707a58d..fceb4414e31 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.21.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.6.21.ebuild @@ -37,4 +37,5 @@ IUSE="" UNIPATCH_LIST=" ${PATCH_DIR}/z0001-kbuild-derive-relative-path-for-srctree-from-CURDIR.patch \ ${PATCH_DIR}/z0002-revert-pahole-flags.patch \ + ${PATCH_DIR}/z0003-Revert-x86-boot-Remove-the-bugger-off-message.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.6/z0003-Revert-x86-boot-Remove-the-bugger-off-message.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.6/z0003-Revert-x86-boot-Remove-the-bugger-off-message.patch new file mode 100644 index 00000000000..6f3a7370f8d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.6/z0003-Revert-x86-boot-Remove-the-bugger-off-message.patch @@ -0,0 +1,103 @@ +From 9f34a9ffe5b94aee93baa5762719546e0bebc28d Mon Sep 17 00:00:00 2001 +From: Kai Lueke +Date: Fri, 15 Mar 2024 11:49:50 +0100 +Subject: [PATCH] Revert "x86/boot: Remove the 'bugger off' message" + +This reverts commit 768171d7ebbce005210e1cf8456f043304805c15 because for +now this is still needed to store the dm-verity hash. +--- + arch/x86/boot/header.S | 49 ++++++++++++++++++++++++++++++++++++++++++ + arch/x86/boot/setup.ld | 7 +++--- + 2 files changed, 52 insertions(+), 4 deletions(-) + +diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S +index a1bbedd989e4..c7624caf6840 100644 +--- a/arch/x86/boot/header.S ++++ b/arch/x86/boot/header.S +@@ -41,15 +41,64 @@ SYSSEG = 0x1000 /* historical load address >> 4 */ + + .code16 + .section ".bstext", "ax" ++ ++ .global bootsect_start ++bootsect_start: + #ifdef CONFIG_EFI_STUB + # "MZ", MS-DOS header + .word MZ_MAGIC ++#endif ++ ++ # Normalize the start address ++ ljmp $BOOTSEG, $start2 ++ ++start2: ++ movw %cs, %ax ++ movw %ax, %ds ++ movw %ax, %es ++ movw %ax, %ss ++ xorw %sp, %sp ++ sti ++ cld ++ ++ movw $bugger_off_msg, %si ++ ++msg_loop: ++ lodsb ++ andb %al, %al ++ jz bs_die ++ movb $0xe, %ah ++ movw $7, %bx ++ int $0x10 ++ jmp msg_loop ++ ++bs_die: ++ # Allow the user to press a key, then reboot ++ xorw %ax, %ax ++ int $0x16 ++ int $0x19 ++ ++ # int 0x19 should never return. In case it does anyway, ++ # invoke the BIOS reset code... ++ ljmp $0xf000,$0xfff0 ++ ++#ifdef CONFIG_EFI_STUB + .org 0x38 + # + # Offset to the PE header. + # + .long LINUX_PE_MAGIC + .long pe_header ++#endif /* CONFIG_EFI_STUB */ ++ ++ .section ".bsdata", "a" ++bugger_off_msg: ++ .ascii "Use a boot loader.\r\n" ++ .ascii "\n" ++ .ascii "Remove disk and press any key to reboot...\r\n" ++ .byte 0 ++ ++#ifdef CONFIG_EFI_STUB + pe_header: + .long PE_MAGIC + +diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld +index 3a2d1360abb0..c3e354d312d0 100644 +--- a/arch/x86/boot/setup.ld ++++ b/arch/x86/boot/setup.ld +@@ -10,11 +10,10 @@ ENTRY(_start) + SECTIONS + { + . = 0; +- .bstext : { +- *(.bstext) +- . = 495; +- } =0xffffffff ++ .bstext : { *(.bstext) } ++ .bsdata : { *(.bsdata) } + ++ . = 495; + .header : { *(.header) } + .entrytext : { *(.entrytext) } + .inittext : { *(.inittext) } +-- +2.44.0 +