summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-02 08:33:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-04 14:03:54 (GMT)
commita26db5c9447679eba709aec1cacf6766feb1f312 (patch)
treed4c5842e003f894f31da1f0d3c53e8387acf76c8 /meta
parent1c37bbab4ffa20e4f88197283f48d9ab4acefad9 (diff)
downloadpoky-a26db5c9447679eba709aec1cacf6766feb1f312.tar.gz
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. (From OE-Core rev: be32692c627a14509de5eb3834e7321c3c5faf25) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass2
-rw-r--r--meta/conf/abi_version.conf2
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.185.bb1
-rw-r--r--meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb1
4 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 89e9f56..7f4b1f6 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -1,4 +1,4 @@
1SSTATE_VERSION = "3" 1SSTATE_VERSION = "5"
2 2
3SSTATE_MANIFESTS ?= "${TMPDIR}/sstate-control" 3SSTATE_MANIFESTS ?= "${TMPDIR}/sstate-control"
4SSTATE_MANFILEPREFIX = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-${PN}" 4SSTATE_MANFILEPREFIX = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-${PN}"
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index 35faef9..e84cad1 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -12,4 +12,4 @@ OELAYOUT_ABI = "14"
12# a reset of the equivalence, for example when reproducibility issues break the 12# a reset of the equivalence, for example when reproducibility issues break the
13# existing match data. Distros can also append to this value for the same effect. 13# existing match data. Distros can also append to this value for the same effect.
14# 14#
15HASHEQUIV_HASH_VERSION = "5" 15HASHEQUIV_HASH_VERSION = "8"
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.185.bb b/meta/recipes-devtools/elfutils/elfutils_0.185.bb
index 9ea4de8..f4769e3 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
34 34
35# remove at next version upgrade or when output changes 35# remove at next version upgrade or when output changes
36PR = "r1" 36PR = "r1"
37HASHEQUIV_HASH_VERSION .= ".2"
38 37
39inherit autotools gettext ptest pkgconfig 38inherit autotools gettext ptest pkgconfig
40 39
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
index 0dd18d7..62aa1b0 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
28 28
29# remove at next version upgrade or when output changes 29# remove at next version upgrade or when output changes
30PR = "r1" 30PR = "r1"
31HASHEQUIV_HASH_VERSION .= ".1"
32 31
33RECIPE_NO_UPDATE_REASON = "6.04-pre3 is broken" 32RECIPE_NO_UPDATE_REASON = "6.04-pre3 is broken"
34UPSTREAM_CHECK_URI = "https://www.zytor.com/pub/syslinux/" 33UPSTREAM_CHECK_URI = "https://www.zytor.com/pub/syslinux/"