summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-28 17:59:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-02 23:09:22 +0100
commit1b3415acd28d2184a95a2bb05ecd4413bd060f35 (patch)
tree3c9ed13bca13f4ce6176534c49f6eae57e800bb5 /meta
parent830059cdeb6396dd2e6766f6053ce3b39dc0b7bb (diff)
downloadpoky-1b3415acd28d2184a95a2bb05ecd4413bd060f35.tar.gz
sstatesig: Revert "Test cross/native hashserv method extension"
This reverts commit 2a76082363d189880613765ad339718e3614049d. We have an issue where x86 host builds are not matching hashes with aarch64 host builds. We'd expect that for a given target, the target artefacts should work regardless of the host architecture, compiler version etc. but this isn't happening and the hashes are differing. This is due to issues from hash equivalence. I believe the commit being reverted was added as a test and there were other fixes at the time which resolved these issues. As illustration of that, different gcc versions are not cauing issues with hash equivalence. That should be similar to the aarch64 case vs. x86-64 and hence if we're not seeing gcc verison issues, we also don't need this special case. As such, revert it as we don't need it and it is in fact breaking sstate reuse cross platform. [YOCTO #14578] (From OE-Core rev: be67dc551ca15a6f19855e8e99848aab2a33800d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/sstatesig.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index dd6b9de7bb..24577249ff 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -108,7 +108,6 @@ class SignatureGeneratorOEBasicHashMixIn(object):
108 self.unlockedrecipes = (data.getVar("SIGGEN_UNLOCKED_RECIPES") or 108 self.unlockedrecipes = (data.getVar("SIGGEN_UNLOCKED_RECIPES") or
109 "").split() 109 "").split()
110 self.unlockedrecipes = { k: "" for k in self.unlockedrecipes } 110 self.unlockedrecipes = { k: "" for k in self.unlockedrecipes }
111 self.buildarch = data.getVar('BUILD_ARCH')
112 self._internal = False 111 self._internal = False
113 pass 112 pass
114 113
@@ -147,13 +146,6 @@ class SignatureGeneratorOEBasicHashMixIn(object):
147 self.dump_lockedsigs(sigfile) 146 self.dump_lockedsigs(sigfile)
148 return super(bb.siggen.SignatureGeneratorBasicHash, self).dump_sigs(dataCache, options) 147 return super(bb.siggen.SignatureGeneratorBasicHash, self).dump_sigs(dataCache, options)
149 148
150 def prep_taskhash(self, tid, deps, dataCaches):
151 super().prep_taskhash(tid, deps, dataCaches)
152 if hasattr(self, "extramethod"):
153 (mc, _, _, fn) = bb.runqueue.split_tid_mcfn(tid)
154 inherits = " ".join(dataCaches[mc].inherits[fn])
155 if inherits.find("/native.bbclass") != -1 or inherits.find("/cross.bbclass") != -1:
156 self.extramethod[tid] = ":" + self.buildarch
157 149
158 def get_taskhash(self, tid, deps, dataCaches): 150 def get_taskhash(self, tid, deps, dataCaches):
159 if tid in self.lockedhashes: 151 if tid in self.lockedhashes: