From be32692c627a14509de5eb3834e7321c3c5faf25 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 2 Oct 2021 09:33:18 +0100 Subject: abi_version/sstate: Bump HASH_VERSION and SSTATE_VERSION At this point the hash equivalence and sstate is 'junk' on the autobuilder unforuntately due to the volume of fixes and also the volume of slighly not quite right patches tested during the development of the fixes. In order to try and help any remaining sanity I might have, bump the version numbers to start with a clean slate so we're working from a known good baseline rather than risk chasing phantom issues. For those upgrading, there wouldn't be much reuse anyway after the changes. Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 2 +- meta/conf/abi_version.conf | 2 +- meta/recipes-devtools/elfutils/elfutils_0.185.bb | 1 - meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 89e9f56178..7f4b1f6804 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -1,4 +1,4 @@ -SSTATE_VERSION = "3" +SSTATE_VERSION = "5" SSTATE_MANIFESTS ?= "${TMPDIR}/sstate-control" SSTATE_MANFILEPREFIX = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-${PN}" diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf index 35faef9a36..e84cad1019 100644 --- a/meta/conf/abi_version.conf +++ b/meta/conf/abi_version.conf @@ -12,4 +12,4 @@ OELAYOUT_ABI = "14" # 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 = "5" +HASHEQUIV_HASH_VERSION = "8" diff --git a/meta/recipes-devtools/elfutils/elfutils_0.185.bb b/meta/recipes-devtools/elfutils/elfutils_0.185.bb index 9ea4de8e40..f4769e3632 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.185.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.185.bb @@ -34,7 +34,6 @@ SRC_URI[sha256sum] = "dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2a # remove at next version upgrade or when output changes PR = "r1" -HASHEQUIV_HASH_VERSION .= ".2" inherit autotools gettext ptest pkgconfig diff --git a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb index 0dd18d7a06..62aa1b0e87 100644 --- a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb +++ b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb @@ -28,7 +28,6 @@ SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3 # remove at next version upgrade or when output changes PR = "r1" -HASHEQUIV_HASH_VERSION .= ".1" RECIPE_NO_UPDATE_REASON = "6.04-pre3 is broken" UPSTREAM_CHECK_URI = "https://www.zytor.com/pub/syslinux/" -- cgit 1.2.3-korg