From 3aa0aa841ef190e646f521b295c99f9889703798 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 17 Aug 2021 15:51:55 -0500 Subject: systemd: set zstd as default PACKAGECONFIG Upstream supports zstd compression now as an alternative to zlib or xz. zstd is only slightly larger than xz but is significantly faster. This makes it a better candidate for the journal. Enable it in systemd instead of xz. Add an exemption for witherspoon to continue using xz instead. Having both zstd and xz support built into the image puts us over the flash limit and we currently need xz for phosphor-debug-collector. Signed-off-by: Patrick Williams Change-Id: I6fb55b96776aeeea1c544743b08bdbbc2853e7b7 --- meta-ibm/recipes-core/systemd/systemd_%.bbappend | 6 ++++++ meta-phosphor/recipes-core/systemd/systemd_%.bbappend | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-ibm/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/recipes-core/systemd/systemd_%.bbappend index b61d9306d..354ea4055 100644 --- a/meta-ibm/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/recipes-core/systemd/systemd_%.bbappend @@ -25,3 +25,9 @@ do_install:append:p10bmc() { install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf install -m 644 -D ${WORKDIR}/journald-size-policy-16MB.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf } + +# Witherspoon doesn't have the space for the both zstd and xz compression +# libraries and currently phosphor-debug-collector is using xz. Switch systemd +# to use xz so only one of the two is added into the image. +PACKAGECONFIG:remove:witherspoon = "zstd" +PACKAGECONFIG:append:witherspoon = " xz" diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index 20ce37c11..8a072770d 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend @@ -14,7 +14,7 @@ PACKAGECONFIG = "\ sysvinit \ timedated \ timesyncd \ - xz \ + zstd \ " FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -- cgit v1.2.3