From 2f04c5f8a3063206c66fa69a346d2776b8074115 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 8 May 2024 15:29:21 +0200 Subject: [PATCH] linux: always use xz for compressing modules The change I merged too hastily in #302300 increases the size by ~30%. This could be improved upon, but in the meantime let's go back to xz while keeping zstd-compressed firmware (only 4.4% larger) and _support_ for zstd-compressed modules. --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index c18f3af9219f..b27d4c658bfe 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -53,7 +53,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - `system.etc.overlay.enable` option was added. If enabled, `/etc` is mounted via an overlayfs instead of being created by a custom perl script. -- For each supporting version of the Linux kernel firmware blobs and kernel modules +- For each supporting version of the Linux kernel firmware blobs are compressed with zstd. For firmware blobs this means an increase of 4.4% in size, however a significantly higher decompression speed. diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index cf38897c5070..62922d442697 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -951,8 +951,7 @@ let ZEROPLUS_FF = yes; MODULE_COMPRESS = whenOlder "5.13" yes; - MODULE_COMPRESS_XZ = whenOlder "5.13" yes; - MODULE_COMPRESS_ZSTD = whenAtLeast "5.13" yes; + MODULE_COMPRESS_XZ = yes; SYSVIPC = yes; # System-V IPC