From 23cdfa9eb23146a69edb77a83ef03719a62ddaae Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 30 Apr 2020 20:55:39 +0100 Subject: abi_version/staging: Bump versions to force rebuild after sstate corruption A "broken" buildtools-extended-tarball has been released into the wild where it is optimising binaries for the host processsor. This is fine in local usage but in a non-homogeneous cluster like our autobuilder, this results in SIGILL on other machines when the sstate is shared amongst them and is painful to debug. The buildtools tarball has been fixed but we need to invalidate the hash equivalence and sstate data. This change does that. Adding to OE-Core rather than autobuilder local changes as its good to illustrate how to do this and the issue is potentially wider than just Yocto Project infrastructure. Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 1 + meta/conf/abi_version.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 5b04f88b2d..de3a19815a 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -93,6 +93,7 @@ SYSROOT_PREPROCESS_FUNCS ?= "" SYSROOT_DESTDIR = "${WORKDIR}/sysroot-destdir" python do_populate_sysroot () { + # SYSROOT 'version' 2 bb.build.exec_func("sysroot_stage_all", d) bb.build.exec_func("sysroot_strip", d) for f in (d.getVar('SYSROOT_PREPROCESS_FUNCS') or '').split(): diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index 2bdc55695b..e04343b47c 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -12,4 +12,4 @@ OELAYOUT_ABI = "12" # a reset of the equivalence, for example when reproducibility issues break the # existing match data. Distros can also append to this value for the same effect. # -HASHEQUIV_HASH_VERSION = "1" +HASHEQUIV_HASH_VERSION = "3" -- cgit 1.2.3-korg