siggen.py: remove path in 'runtaskdeps'
PATCH 3/3 siggen.py: remove path in 'runtaskdeps'
the absolute path brings trouble when comparing .siginfo generated from different src tree, since they always differ. Actually what we require is just the fn+task, so remove path info from 'runtaskdeps' to make it relocatable.
Signed-off-by Kevin Tian <[email protected]>
--- bitbake/lib/bb/siggen.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)
bitbake/lib/bb/siggen.py +7 -3
@@ -174,10 +174,14 @@ class SignatureGeneratorBasic(SignatureGenerator): data['varvals'][dep] = self.lookupcache[fn][dep] if runtime: - data['runtaskdeps'] = self.runtaskdeps[k] + data['runtaskdeps'] = [] data['runtaskhashes'] = {} - for dep in data['runtaskdeps']: - data['runtaskhashes'][dep] = self.taskhash[dep] + for dep in self.runtaskdeps[k]: + # keep "virtual:native:" and "fn.task". remove the path. + dep1 = dep.split('/') + dep2 = dep1[0] + dep1[-1] + data['runtaskdeps'].append(dep2) + data['runtaskhashes'][dep2] = self.taskhash[dep] p = pickle.Pickler(file(sigfile, "wb"), -1) p.dump(data)
Signature · 1 line
1.6.0.4