From 144226a5ca2c93504c87c550a1c82dcff8cfde78 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 19 Jan 2023 16:35:25 +0000 Subject: [PATCH] systemd: add PACKAGECONFIG to select default compression format If multiple compression libraries are enabled, the format to use for compression is chosen implicitly, so if you want to compress with e.g. lz4 you cannot enable zstd, so you cannot read zstd-compressed journal files. This PACKAGECONFIGs allow to enable all compression formats for reading, but to choose a specific one for writing. (From OE-Core rev: bec1e2628e7accf2eff07193ae5ea14eb443ae37) Signed-off-by: Luca Boccassi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_252.4.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-core/systemd/systemd_252.4.bb b/meta/recipes-core/systemd/systemd_252.4.bb index 7c3c78a364..d291a2a9a1 100644 --- a/meta/recipes-core/systemd/systemd_252.4.bb +++ b/meta/recipes-core/systemd/systemd_252.4.bb @@ -129,6 +129,12 @@ PACKAGECONFIG[cgroupv2] = "-Ddefault-hierarchy=unified,-Ddefault-hierarchy=hybri PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false" PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup,,cryptsetup" PACKAGECONFIG[tpm2] = "-Dtpm2=true,-Dtpm2=false,tpm2-tss,tpm2-tss libtss2 libtss2-tcti-device" +# If multiple compression libraries are enabled, the format to use for compression is chosen implicitly, +# so if you want to compress with e.g. lz4 you cannot enable zstd, so you cannot read zstd-compressed journal files. +# This option allows to enable all compression formats for reading, but choosing a specific one for writing. +PACKAGECONFIG[default-compression-lz4] = "-Dlz4=true -Ddefault-compression=lz4,,lz4" +PACKAGECONFIG[default-compression-xz] = "-Dxz=true -Ddefault-compression=xz,,xz" +PACKAGECONFIG[default-compression-zstd] = "-Dzstd=true -Ddefault-compression=zstd,,zstd" PACKAGECONFIG[dbus] = "-Ddbus=true,-Ddbus=false,dbus" PACKAGECONFIG[efi] = "-Defi=true,-Defi=false" PACKAGECONFIG[gnu-efi] = "-Dgnu-efi=true -Defi-libdir=${STAGING_LIBDIR} -Defi-includedir=${STAGING_INCDIR}/efi,-Dgnu-efi=false,gnu-efi"