[v2,1/1] bitbake.conf: fix vardepsexclude for ZSTD_DEFAULTS

Message ID 20240725084701.856618-2-benedikt.niedermayr@siemens.com
State Accepted, archived
Headers show
Series bitbake.conf: fix vardepsexclude for ZSTD_DEFAULTS | expand

Commit Message

Benedikt Niedermayr July 25, 2024, 8:47 a.m. UTC
This fixes a rebuild in case ZSTD_LEVEL changes. This is valid since
a different compression level leads to different outputs.

This patch copies the current implementation from OE and thereby
fixing this issue in order to be more aligned with the OE
naming convention.

Signed-off-by: Benedikt Niedermayr <benedikt.niedermayr@siemens.com>
---
 meta/conf/bitbake.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--
2.34.1

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4cfa8b10b58b..cda980358fd6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -159,9 +159,10 @@  XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS"
 # Default parallelism for zstd
 ZSTD_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}"
 ZSTD_THREADS[vardepvalue] = "1"
-ZSTD_LEVEL ?= "19"
-ZSTD_DEFAULTS ?= "--rsyncable -${ZSTD_LEVEL} --threads=${ZSTD_THREADS}"
-ZSTD_DEFAULTS[vardepsexclude] += "ZSTD_LEVEL ZSTD_THREADS"
+
+ZSTD_COMPRESSION_LEVEL ?= "-3"
+ZSTD_DEFAULTS ?= "--threads=${ZSTD_THREADS} ${ZSTD_COMPRESSION_LEVEL}"
+ZSTD_DEFAULTS[vardepsexclude] = "ZSTD_THREADS"

 # Default compression settings for zchunk
 ZCK_DEFAULTS ?= ""