From 407459da274c80620282a2b690dac1fd3c32394f Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 9 Feb 2022 16:20:12 +0300 Subject: [PATCH] feat: enable zstd squashfs compression and firmware (xz) compression Bump tools to the version with `zstd` support. Enable kernel-level squashfs zstd decompression. Enable firmware decompression, Linux 5.15 only supports .xz format, but it would allow us to compress the firmware blobs in the initramfs. Signed-off-by: Andrey Smirnov --- Pkgfile | 2 +- kernel/build/config-amd64 | 5 +++-- kernel/build/config-arm64 | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Pkgfile b/Pkgfile index 4ccc983f..5e6ac994 100644 --- a/Pkgfile +++ b/Pkgfile @@ -3,7 +3,7 @@ format: v1alpha2 vars: - TOOLS_IMAGE: ghcr.io/talos-systems/tools:v0.10.0-alpha.0-1-g67314b1 + TOOLS_IMAGE: ghcr.io/talos-systems/tools:v0.10.0-alpha.0-2-gd33b4b6 labels: org.opencontainers.image.source: https://github.com/talos-systems/pkgs diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64 index e7dfba08..d0f65145 100644 --- a/kernel/build/config-amd64 +++ b/kernel/build/config-amd64 @@ -1834,9 +1834,10 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" # CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y CONFIG_FW_CACHE=y # end of Firmware loader @@ -5125,7 +5126,7 @@ CONFIG_SQUASHFS_XATTR=y # CONFIG_SQUASHFS_LZ4 is not set # CONFIG_SQUASHFS_LZO is not set CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64 index 5badd1e9..c10ba0d5 100644 --- a/kernel/build/config-arm64 +++ b/kernel/build/config-arm64 @@ -1955,9 +1955,10 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_EXTRA_FIRMWARE="" # CONFIG_FW_LOADER_USER_HELPER is not set -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y CONFIG_FW_CACHE=y # end of Firmware loader @@ -7837,7 +7838,7 @@ CONFIG_SQUASHFS_XATTR=y # CONFIG_SQUASHFS_LZ4 is not set # CONFIG_SQUASHFS_LZO is not set CONFIG_SQUASHFS_XZ=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3