summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2015-04-03 15:04:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:32 +0100
commita146e8ccfcc9d7f957de60c8634b38bb3431ca04 (patch)
tree4d710a6f4aa8f67365e28d1e8f6dfc3a48c6b7cd /bitbake/lib
parent3ed754b37566ea52016d0297cc3c0865d5fe3eb6 (diff)
downloadpoky-a146e8ccfcc9d7f957de60c8634b38bb3431ca04.tar.gz
bitbake: runqueue: pass finalized metadata to scenequeue callbacks
This ensures that _append, _prepend, overrides, etc are functional when used on sstate variables (e.g. SSTATE_DIR). [YOCTO #7564] (Bitbake rev: 2e683c25b856b431198573f7f352d841587275e6) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/runqueue.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index c503980666..b1fe6b8a7b 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1155,7 +1155,7 @@ class RunQueue:
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)" 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.data } 1158 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) 1159 valid = bb.utils.better_eval(call, locs)
1160 for v in valid: 1160 for v in valid:
1161 valid_new.add(sq_task[v]) 1161 valid_new.add(sq_task[v])
@@ -1331,7 +1331,7 @@ class RunQueueExecute:
1331 taskname = self.rqdata.runq_task[depid] 1331 taskname = self.rqdata.runq_task[depid]
1332 taskdata[dep] = [pn, taskname, fn] 1332 taskdata[dep] = [pn, taskname, fn]
1333 call = self.rq.depvalidate + "(task, taskdata, notneeded, d)" 1333 call = self.rq.depvalidate + "(task, taskdata, notneeded, d)"
1334 locs = { "task" : task, "taskdata" : taskdata, "notneeded" : self.scenequeue_notneeded, "d" : self.cooker.data } 1334 locs = { "task" : task, "taskdata" : taskdata, "notneeded" : self.scenequeue_notneeded, "d" : self.cooker.expanded_data }
1335 valid = bb.utils.better_eval(call, locs) 1335 valid = bb.utils.better_eval(call, locs)
1336 return valid 1336 return valid
1337 1337
@@ -1400,7 +1400,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
1400 1400
1401 call = self.rq.setsceneverify + "(covered, tasknames, fnids, fns, d, invalidtasks=invalidtasks)" 1401 call = self.rq.setsceneverify + "(covered, tasknames, fnids, fns, d, invalidtasks=invalidtasks)"
1402 call2 = self.rq.setsceneverify + "(covered, tasknames, fnids, fns, d)" 1402 call2 = self.rq.setsceneverify + "(covered, tasknames, fnids, fns, d)"
1403 locs = { "covered" : self.rq.scenequeue_covered, "tasknames" : self.rqdata.runq_task, "fnids" : self.rqdata.runq_fnid, "fns" : self.rqdata.taskData.fn_index, "d" : self.cooker.data, "invalidtasks" : invalidtasks } 1403 locs = { "covered" : self.rq.scenequeue_covered, "tasknames" : self.rqdata.runq_task, "fnids" : self.rqdata.runq_fnid, "fns" : self.rqdata.taskData.fn_index, "d" : self.cooker.expanded_data, "invalidtasks" : invalidtasks }
1404 # Backwards compatibility with older versions without invalidtasks 1404 # Backwards compatibility with older versions without invalidtasks
1405 try: 1405 try:
1406 covered_remove = bb.utils.better_eval(call, locs) 1406 covered_remove = bb.utils.better_eval(call, locs)
@@ -1820,7 +1820,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
1820 sq_taskname.append(taskname) 1820 sq_taskname.append(taskname)
1821 sq_task.append(task) 1821 sq_task.append(task)
1822 call = self.rq.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)" 1822 call = self.rq.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)"
1823 locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.data } 1823 locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.expanded_data }
1824 valid = bb.utils.better_eval(call, locs) 1824 valid = bb.utils.better_eval(call, locs)
1825 1825
1826 valid_new = stamppresent 1826 valid_new = stamppresent