If the dependency ID is being used to track task dependencies, the hash
validation function needs to know about it in order to properly validate
the hash.
TODO: This currently isn't going to be backward compatible with older
hashvalidate functions. Is that necessary, and if so are there any
suggestions for a good approach?
Signed-off-by: Joshua Watt <jpewhac...@gmail.com>
---
bitbake/lib/bb/runqueue.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 5922431bbe1..82dce426bd1 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1531,6 +1531,7 @@ class RunQueue:
valid = []
sq_hash = []
sq_hashfn = []
+ sq_depid = []
sq_fn = []
sq_taskname = []
sq_task = []
@@ -1549,15 +1550,16 @@ class RunQueue:
sq_fn.append(fn)
sq_hashfn.append(self.rqdata.dataCaches[mc].hashfn[taskfn])
sq_hash.append(self.rqdata.runtaskentries[tid].hash)
+ sq_depid.append(self.rqdata.runtaskentries[tid].depid)
sq_taskname.append(taskname)
sq_task.append(tid)
- locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" :
sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.data }
+ locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" :
sq_hash, "sq_hashfn" : sq_hashfn, "sq_depid" : sq_depid, "d" : self.cooker.data
}
try:
- call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn,
d, siginfo=True)"
+ call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn,
sq_depid, d, siginfo=True)"
valid = bb.utils.better_eval(call, locs)
# Handle version with no siginfo parameter
except TypeError:
- call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn,
d)"
+ call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn,
sq_depid, d)"
valid = bb.utils.better_eval(call, locs)
for v in valid:
valid_new.add(sq_task[v])
@@ -2269,6 +2271,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
if self.rq.hashvalidate:
sq_hash = []
sq_hashfn = []
+ sq_depid = []
sq_fn = []
sq_taskname = []
sq_task = []
@@ -2300,10 +2303,11 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
sq_fn.append(fn)
sq_hashfn.append(self.rqdata.dataCaches[mc].hashfn[taskfn])
sq_hash.append(self.rqdata.runtaskentries[tid].hash)
+ sq_depid.append(self.rqdata.runtaskentries[tid].depid)
sq_taskname.append(taskname)
sq_task.append(tid)
- call = self.rq.hashvalidate + "(sq_fn, sq_task, sq_hash,
sq_hashfn, d)"
- locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" :
sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.data }
+ call = self.rq.hashvalidate + "(sq_fn, sq_task, sq_hash,
sq_hashfn, sq_depid, d)"
+ locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" :
sq_hash, "sq_hashfn" : sq_hashfn, "sq_depid": sq_depid, "d" : self.cooker.data }
valid = bb.utils.better_eval(call, locs)
valid_new = stamppresent
--
2.17.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
