summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/runqueue.py
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2023-05-30 10:04:54 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-01 08:08:33 +0100
commitc6763d27efd11e2bc2a62147890ad1067c4af2ec (patch)
tree7745ccc19ebbc39aee9c35a65d3fcf73d158679b /bitbake/lib/bb/runqueue.py
parent28a7202ac5589d25816dbbd0f6f47a3e70eb7684 (diff)
downloadpoky-c6763d27efd11e2bc2a62147890ad1067c4af2ec.tar.gz
bitbake: runqueue: Pass hashfn in taskdep data
Include the hashfn (the value of BB_HASHFILENAME) in the task dependency data. This allows tasks to get a specific unique hash for dependent tasks when one is available. (Bitbake rev: 4dbecf6059e495246267b09d0f43086d51e6df2c) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r--bitbake/lib/bb/runqueue.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 1eac2da5e8..01701348ed 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -2353,7 +2353,8 @@ class RunQueueExecute:
2353 taskhash = self.rqdata.runtaskentries[revdep].hash 2353 taskhash = self.rqdata.runtaskentries[revdep].hash
2354 unihash = self.rqdata.runtaskentries[revdep].unihash 2354 unihash = self.rqdata.runtaskentries[revdep].unihash
2355 deps = self.filtermcdeps(task, mc, deps) 2355 deps = self.filtermcdeps(task, mc, deps)
2356 taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash, unihash] 2356 hashfn = self.rqdata.dataCaches[mc].hashfn[taskfn]
2357 taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash, unihash, hashfn]
2357 for revdep2 in deps: 2358 for revdep2 in deps:
2358 if revdep2 not in taskdepdata: 2359 if revdep2 not in taskdepdata:
2359 additional.append(revdep2) 2360 additional.append(revdep2)
@@ -2693,7 +2694,8 @@ class RunQueueExecute:
2693 provides = self.rqdata.dataCaches[mc].fn_provides[taskfn] 2694 provides = self.rqdata.dataCaches[mc].fn_provides[taskfn]
2694 taskhash = self.rqdata.runtaskentries[revdep].hash 2695 taskhash = self.rqdata.runtaskentries[revdep].hash
2695 unihash = self.rqdata.runtaskentries[revdep].unihash 2696 unihash = self.rqdata.runtaskentries[revdep].unihash
2696 taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash, unihash] 2697 hashfn = self.rqdata.dataCaches[mc].hashfn[taskfn]
2698 taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash, unihash, hashfn]
2697 for revdep2 in deps: 2699 for revdep2 in deps:
2698 if revdep2 not in taskdepdata: 2700 if revdep2 not in taskdepdata:
2699 additional.append(revdep2) 2701 additional.append(revdep2)