Переглянути джерело

Update Debian kernel to v6.10.3

Maximilian Luz 11 місяців тому
батько
коміт
f189b1b4d1

+ 6 - 6
pkg/debian/kernel/0001-Add-secureboot-pre-signing-to-the-kernel.patch

@@ -1,4 +1,4 @@
-From 43a7e8759162fa25aea203ce732f177bc6f15cdb Mon Sep 17 00:00:00 2001
+From e4eb5bb44e5ac84958c641f62fcfec5114d03073 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 22 Sep 2019 22:44:16 +0200
 Subject: [PATCH] Add secureboot pre-signing to the kernel
@@ -21,10 +21,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
  create mode 100755 scripts/sign_kernel.sh
 
 diff --git a/.gitignore b/.gitignore
-index 7f86e0837909..04aaae490610 100644
+index c59dc60ba62e..d60f75150ebf 100644
 --- a/.gitignore
 +++ b/.gitignore
-@@ -152,6 +152,9 @@ signing_key.priv
+@@ -149,6 +149,9 @@ signing_key.priv
  signing_key.x509
  x509.genkey
  
@@ -35,10 +35,10 @@ index 7f86e0837909..04aaae490610 100644
  /all.config
  /alldef.config
 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index fdc2e3abd615..c7a374c7ceaf 100644
+index 801fd85c3ef6..1b1a72179a74 100644
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -283,6 +283,7 @@ endif
+@@ -302,6 +302,7 @@ endif
  	$(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)
  	$(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot
  	$(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/$@
@@ -83,5 +83,5 @@ index 000000000000..d2526a279254
 +sbsign --key $BUILDDIR/keys/MOK.key --cert $BUILDDIR/keys/MOK.crt \
 +    --output $VMLINUX $VMLINUX
 -- 
-2.41.0
+2.45.2
 

+ 3 - 3
pkg/debian/kernel/0001-Partially-revert-integrity-Only-use-machine-keyring-.patch

@@ -1,4 +1,4 @@
-From fbfaff58fe821fa93ceeb17e034886a6d8447207 Mon Sep 17 00:00:00 2001
+From 556d277d8397c8bd0c5889a309e50290d491e41c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 20 Nov 2023 22:54:05 +0100
 Subject: [PATCH] Partially revert "integrity: Only use machine keyring when
@@ -17,7 +17,7 @@ loading. Therefore, revert this change.
  1 file changed, 1 insertion(+), 8 deletions(-)
 
 diff --git a/security/integrity/platform_certs/machine_keyring.c b/security/integrity/platform_certs/machine_keyring.c
-index a401640a63cd1..a1ad244cbf86d 100644
+index a401640a63cd..a1ad244cbf86 100644
 --- a/security/integrity/platform_certs/machine_keyring.c
 +++ b/security/integrity/platform_certs/machine_keyring.c
 @@ -51,14 +51,7 @@ void __init add_to_machine_keyring(const char *source, const void *data, size_t
@@ -37,5 +37,5 @@ index a401640a63cd1..a1ad244cbf86d 100644
  
  static bool __init trust_moklist(void)
 -- 
-2.42.1
+2.45.2
 

+ 3 - 3
pkg/debian/kernel/0001-kbuild-Link-sign-file-statically.patch

@@ -1,4 +1,4 @@
-From 4113f0e722d93a3728d18464a88d752939e37d9d Mon Sep 17 00:00:00 2001
+From 71701f82718799df961b252fef44e2a75f31e408 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 30 Jun 2024 17:10:28 +0200
 Subject: [PATCH] kbuild: Link sign-file statically
@@ -8,7 +8,7 @@ Subject: [PATCH] kbuild: Link sign-file statically
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scripts/Makefile b/scripts/Makefile
-index bc90520a54266..1d092bfd28e3a 100644
+index fe56eeef09dd..e614f49b17e5 100644
 --- a/scripts/Makefile
 +++ b/scripts/Makefile
 @@ -29,7 +29,7 @@ HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
@@ -21,5 +21,5 @@ index bc90520a54266..1d092bfd28e3a 100644
  ifdef CONFIG_UNWINDER_ORC
  ifeq ($(ARCH),x86_64)
 -- 
-2.45.1
+2.45.2
 

+ 1 - 1
pkg/debian/kernel/version.conf

@@ -1,3 +1,3 @@
-KERNEL_VERSION="6.9.9"
+KERNEL_VERSION="6.10.3"
 KERNEL_REVISION="1"
 KERNEL_LOCALVERSION="-surface"