From c073767c73737da96e95db94e8408a7930d7f71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Kurucz?= Date: Wed, 11 Dec 2024 14:38:59 +0100 Subject: [PATCH] Update kernel to 6.13-rc2 The ISO should be reproducible and have the following SHA256 hash: cc37572f168e1a94e2e04d88d156b29f07acc411d32bca210b4f594d3b28bff0 --- modules/x1e80100.nix | 5 +++++ packages/x1e80100-linux.nix | 13 +++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/x1e80100.nix b/modules/x1e80100.nix index c850f5e..530e73c 100644 --- a/modules/x1e80100.nix +++ b/modules/x1e80100.nix @@ -36,6 +36,11 @@ boot.kernelParams = [ "pd_ignore_unused" "clk_ignore_unused" + + # Needed since 4c3d9c134892c4158867075c840b81a5ed28af1f ("arm64: dts: qcom: + # x1e80100: Add debug uart to Lenovo Yoga Slim 7x"), I guess systemd picks + # UART as the only console, and it does not output logs on the screen. + "console=tty1" ]; hardware.deviceTree.enable = true; diff --git a/packages/x1e80100-linux.nix b/packages/x1e80100-linux.nix index 4f0e5e8..ab8eb49 100644 --- a/packages/x1e80100-linux.nix +++ b/packages/x1e80100-linux.nix @@ -4,10 +4,10 @@ linuxPackagesFor (buildLinux { src = fetchFromGitHub { owner = "jhovold"; repo = "linux"; - rev = "wip/x1e80100-6.12"; - hash = "sha256-CUt4J7IFS14qD8GiZOuSeJmFdbWOmmyV/iJNcTUVN5g="; + rev = "wip/x1e80100-6.13-rc2"; + hash = "sha256-sCapdt5lYw/zXIPIrJ5hECL9Xqviizerp9dmnx4BJpc="; }; - version = "6.12.0"; + version = "6.13.0-rc2"; defconfig = "johan_defconfig"; structuredExtraConfig = with lib.kernel; { @@ -16,13 +16,6 @@ linuxPackagesFor (buildLinux { }; kernelPatches = [ - { - name = "drm/panic: Select ZLIB_DEFLATE for DRM_PANIC_SCREEN_QR_CODE"; - patch = fetchurl { - url = "https://lore.kernel.org/linux-kernel/20241003230734.653717-1-ojeda@kernel.org/raw"; - hash = "sha256-qZTP9o0Pel9M1Y9f/31SZbOJxeM0j28P94EUXa83m+Q="; - }; - } { name = "Add Bluetooth support for the Lenovo Yoga Slim 7x"; patch = fetchpatch {