mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-05 20:26:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1971 from flatcar/linux-6.1.90-flatcar-3815

Browse Source 
Upgrade Linux Kernel for flatcar-3815 from 6.1.87 to 6.1.90
This commit is contained in:
Dongsu Park 2024-05-17 16:20:57 +02:00 committed by GitHub
commit 0ca1eeefa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 106 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/updates/2024-05-03-linux-6.1.90-update.md Normal file
View File

@ -0,0 +1 @@
- Linux ([6.1.90](https://lwn.net/Articles/972212) (includes [6.1.89](https://lwn.net/Articles/971443), [6.1.88](https://lwn.net/Articles/971364)))

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.1.87.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-6.1.90.ebuild vendored
View File

0
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.1.87.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-6.1.90.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest vendored
View File

@ -1,2 +1,2 @@
DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
DIST patch-6.1.87.xz 4462328 BLAKE2B 43dd85222d79006e7cace01ab22d37cd7925816f97890a6fca85b5e6bf3aaa00d726194e841b861c824b2d8021fc186a21fe504cd5df780a6260e5bd2ad7b6e5 SHA512 6f9ebacaab499897af1960394d202e68639f7691cd34a954334eca19355114da719a4013235514433c860b6f101b4c34dd734a68b6f0f55a58eb7ec81f8c2ba4
DIST patch-6.1.90.xz 4533156 BLAKE2B 31f19b7fb52af72f97942d5f0f03ad35098e48bee997b3055d3202bf951b4ed1287f8747c07c948c756b43a67aa5f7121c39108d054227b38398c3a1e564e681 SHA512 d7df5d40a61204a31056e152cc4841a3ff9390e356d4b9f73eca496a1a57f2278c2b2341e4f95e0416bb80c81d4251acc4527c1a3b819baf225174cf8f24c562

1
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.1.87.ebuild → sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-6.1.90.ebuild vendored
View File

@ -38,4 +38,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 \
"

2
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.1/z0002-revert-pahole-flags.patch vendored
View File

@ -8,9 +8,9 @@ index 6d35728b94b2..9ae94bf60971 100644
depends on !RANDSTRUCT
- depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
+ depends on !DEBUG_INFO_BTF
select CONSTRUCTORS
help
Enables Rust support in the kernel.
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index fa307f93fa2e..f18386d4712f 100644
--- a/lib/Kconfig.debug

102
sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/6.1/z0003-Revert-x86-boot-Remove-the-bugger-off-message.patch vendored Normal file
View File

@ -0,0 +1,102 @@
From 9f34a9ffe5b94aee93baa5762719546e0bebc28d Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
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,14 +41,63 @@ 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 0x3c
#
# Offset to the PE header.
#
.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