summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 10:34:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-15 17:45:00 +0100
commit1dc2ee903bb3f075edb0771ca6115e065e008f06 (patch)
tree03ce30454e664c080f8da9e0ef64d9a54d7f2af1 /bitbake
parenta485c2b1ff4de12779dcc3d949e2615e092fdcbd (diff)
downloadpoky-1dc2ee903bb3f075edb0771ca6115e065e008f06.tar.gz
bitbake: runqueue: Handle cases where siginfo is now a parameter to the hashvadlidate function
In some cases we need to check specifically for siginfo files, in some cases we need to check for the actual sstate objects themselves. Therefore make this a parameter to the function. A fallback to the previous function style is maintained for now. (Bitbake rev: 18d3a03e1b07c98b2dce46eb94f30de1a2b4320b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/runqueue.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index b1fe6b8a7b..7ec3ab8fa8 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1154,9 +1154,14 @@ class RunQueue:
1154 sq_hash.append(self.rqdata.runq_hash[task]) 1154 sq_hash.append(self.rqdata.runq_hash[task])
1155 sq_taskname.append(taskname) 1155 sq_taskname.append(taskname)
1156 sq_task.append(task) 1156 sq_task.append(task)
1157 call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)"
1158 locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.expanded_data } 1157 locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.expanded_data }
1159 valid = bb.utils.better_eval(call, locs) 1158 try:
1159 call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=True)"
1160 valid = bb.utils.better_eval(call, locs)
1161 # Handle version with no siginfo parameter
1162 except TypeError:
1163 call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)"
1164 valid = bb.utils.better_eval(call, locs)
1160 for v in valid: 1165 for v in valid:
1161 valid_new.add(sq_task[v]) 1166 valid_new.add(sq_task[v])
1162 1167