Skip to contentSkip to conversation

abi-version/ssate: Bump to avoid systemd hash corruption issue

PATCH In review Richard Purdie 2 participants 3 messages Sep 1, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 abi-version/ssate: Bump to avoid systemd hash corruption issue

Unfortunately some recent patches caused non-deterministic output. One input hash lead to both good and bad output and whilst that patch has been fixed, the problematic hash 'cross' linkage remains. Bump to a new sstate and hash equivalence version to avoid this and work from a clean slate.

---
 meta/classes-global/sstate.bbclass | 2 +-
 meta/conf/abi_version.conf         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/classes-global/sstate.bbclass +1 -1
index beb22f424e8..fdd529ee4e8 100644
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-SSTATE_VERSION = "12"
+SSTATE_VERSION = "14"
 
 SSTATE_ZSTD_CLEVEL ??= "8"
 
meta/conf/abi_version.conf +1 -1
index 0fe91b5ddf3..ac97752c976 100644
@@ -12,4 +12,4 @@ OELAYOUT_ABI = "15"
 # 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  = "17"
+HASHEQUIV_HASH_VERSION  = "18"
#1 lore raw
Quoted 36 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Richard Purdie
Sent: den 1 september 2024 09:19
To: [email protected]
Subject: [OE-core] [PATCH] abi-version/ssate: Bump to avoid systemd hash corruption issue

Unfortunately some recent patches caused non-deterministic output. One input hash lead to both good and bad output and whilst that patch has been fixed, the problematic hash 'cross' linkage remains. Bump to a new sstate and hash equivalence version to avoid this and work from a clean slate.

---
 meta/classes-global/sstate.bbclass | 2 +-
 meta/conf/abi_version.conf         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/classes-global/sstate.bbclass +1 -1
index beb22f424e8..fdd529ee4e8 100644
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-SSTATE_VERSION = "12"
+SSTATE_VERSION = "14"
 
 SSTATE_ZSTD_CLEVEL ??= "8"
 
meta/conf/abi_version.conf +0 -0
index 0fe91b5ddf3..ac97752c976 100644

meta/conf/abi_version.conf OELAYOUT_ABI = "15" · line 15

Quoted 5 lines
meta/conf/abi_version.conf +1 -1
@@ -12,4 +12,4 @@ OELAYOUT_ABI = "15"
 # 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  = "17"
+HASHEQUIV_HASH_VERSION  = "18"

Is this actually needed now after the changes to insane.bbclass? Won't those changes effectively invalidate the whole sstate anyway?

//Peter

#2 lore raw
Quoted 38 lines · Peter Kjellerstedt
Quoted 38 lines

-----Original Message-----
From:
[email protected] <[email protected]

Quoted 1 line

On Behalf Of Richard Purdie

Sent: den 1 september 2024 09:19
To: [email protected]
Subject: [OE-core] [PATCH] abi-version/ssate: Bump to avoid systemd hash corruption issue

Unfortunately some recent patches caused non-deterministic output. One input hash lead to both good and bad output and whilst that patch
has been fixed, the problematic hash 'cross' linkage remains. Bump to
a new sstate and hash equivalence version to avoid this and work from
a clean slate.

---
 meta/classes-global/sstate.bbclass | 2 +-
 meta/conf/abi_version.conf         | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)
meta/classes- renamed from meta/classes-global/sstate.bbclass +0 -0

global/sstate.bbclass
index beb22f424e8..fdd529ee4e8 100644

meta/classes-global/sstate.bbclass +1 -1
@@ -4,7 +4,7 @@
  # SPDX-License-Identifier: MIT
  #
 
-SSTATE_VERSION = "12"
+SSTATE_VERSION = "14"
 

 SSTATE_ZSTD_CLEVEL ??= "8"

Quoted 16 lines

meta/conf/abi_version.conf OELAYOUT_ABI = "15" · line 15

Quoted 13 lines
meta/conf/abi_version.conf +0 -0
index 0fe91b5ddf3..ac97752c976 100644
@@ -12,4 +12,4 @@ OELAYOUT_ABI = "15"
  # 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.
 #
meta/conf/abi_version.conf +1 -1
-HASHEQUIV_HASH_VERSION  = "17"
+HASHEQUIV_HASH_VERSION  = "18"

Is this actually needed now after the changes to insane.bbclass? Won't those changes effectively invalidate the whole sstate anyway?

Firstly, those changes don't change the output of the tasks so no, the mismatched output hashes would have remained a problem.

Secondly, those had already merged and been tested alongside the systemd changes so it was already too late anyway.

So sadly I just can't see an alternative to this due to where the corruption is.

Cheers,

Richard