From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 11 Sep 2021 10:01:45 +0000 (+0100)
Subject: bitbake.conf: Ensure XZ_THREADS doesn't change sstate checksums
X-Git-Tag: yocto-3.4~135
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0296dc71c01d1b7953d74ef37d56429e2f4fcfab;p=openembedded-core.git

bitbake.conf: Ensure XZ_THREADS doesn't change sstate checksums

rpm output packages currently depend on the value of XZ_THREADS which
is ok if left to the default value but problematic if system limits
are set such as on the autobuilder.

Force the value to a specific one in the hashes for better sstate reuse
and consistent rpm task checksums.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2140d498f7..e25d632dc1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -811,6 +811,7 @@ PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"
 # Default parallelism and resource usage for xz
 XZ_MEMLIMIT ?= "50%"
 XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}"
+XZ_THREADS[vardepvalue] = "1"
 XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}"
 XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS"