diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index f1964da906..090d1b56a2 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -957,7 +957,7 @@ class RunQueue: | |||
957 | for task in range(len(self.rqdata.runq_fnid)): | 957 | for task in range(len(self.rqdata.runq_fnid)): |
958 | if self.rqdata.runq_fnid[task] not in done: | 958 | if self.rqdata.runq_fnid[task] not in done: |
959 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] | 959 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]] |
960 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.collection.get_file_appends(fn), self.cooker.configuration.data) | 960 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.collection.get_file_appends(fn), self.cooker.data) |
961 | done.add(self.rqdata.runq_fnid[task]) | 961 | done.add(self.rqdata.runq_fnid[task]) |
962 | 962 | ||
963 | bb.parse.siggen.dump_sigs(self.rqdata.dataCache) | 963 | bb.parse.siggen.dump_sigs(self.rqdata.dataCache) |
@@ -1119,11 +1119,11 @@ class RunQueueExecute: | |||
1119 | if umask: | 1119 | if umask: |
1120 | os.umask(umask) | 1120 | os.umask(umask) |
1121 | 1121 | ||
1122 | self.cooker.configuration.data.setVar("BB_WORKERCONTEXT", "1") | 1122 | self.cooker.data.setVar("BB_WORKERCONTEXT", "1") |
1123 | bb.parse.siggen.set_taskdata(self.rqdata.hashes, self.rqdata.hash_deps) | 1123 | bb.parse.siggen.set_taskdata(self.rqdata.hashes, self.rqdata.hash_deps) |
1124 | ret = 0 | 1124 | ret = 0 |
1125 | try: | 1125 | try: |
1126 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.collection.get_file_appends(fn), self.cooker.configuration.data) | 1126 | the_data = bb.cache.Cache.loadDataFull(fn, self.cooker.collection.get_file_appends(fn), self.cooker.data) |
1127 | the_data.setVar('BB_TASKHASH', self.rqdata.runq_hash[task]) | 1127 | the_data.setVar('BB_TASKHASH', self.rqdata.runq_hash[task]) |
1128 | for h in self.rqdata.hashes: | 1128 | for h in self.rqdata.hashes: |
1129 | the_data.setVar("BBHASH_%s" % h, self.rqdata.hashes[h]) | 1129 | the_data.setVar("BBHASH_%s" % h, self.rqdata.hashes[h]) |
@@ -1180,7 +1180,7 @@ class RunQueueExecute: | |||
1180 | taskname = self.rqdata.runq_task[depid] | 1180 | taskname = self.rqdata.runq_task[depid] |
1181 | taskdata[dep] = [pn, taskname, fn] | 1181 | taskdata[dep] = [pn, taskname, fn] |
1182 | call = self.rq.depvalidate + "(task, taskdata, notneeded, d)" | 1182 | call = self.rq.depvalidate + "(task, taskdata, notneeded, d)" |
1183 | locs = { "task" : task, "taskdata" : taskdata, "notneeded" : self.scenequeue_notneeded, "d" : self.cooker.configuration.data } | 1183 | locs = { "task" : task, "taskdata" : taskdata, "notneeded" : self.scenequeue_notneeded, "d" : self.cooker.data } |
1184 | valid = bb.utils.better_eval(call, locs) | 1184 | valid = bb.utils.better_eval(call, locs) |
1185 | return valid | 1185 | return valid |
1186 | 1186 | ||
@@ -1247,7 +1247,7 @@ class RunQueueExecuteTasks(RunQueueExecute): | |||
1247 | 1247 | ||
1248 | call = self.rq.setsceneverify + "(covered, tasknames, fnids, fns, d, invalidtasks=invalidtasks)" | 1248 | call = self.rq.setsceneverify + "(covered, tasknames, fnids, fns, d, invalidtasks=invalidtasks)" |
1249 | call2 = self.rq.setsceneverify + "(covered, tasknames, fnids, fns, d)" | 1249 | call2 = self.rq.setsceneverify + "(covered, tasknames, fnids, fns, d)" |
1250 | 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.configuration.data, "invalidtasks" : invalidtasks } | 1250 | 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 } |
1251 | # Backwards compatibility with older versions without invalidtasks | 1251 | # Backwards compatibility with older versions without invalidtasks |
1252 | try: | 1252 | try: |
1253 | covered_remove = bb.utils.better_eval(call, locs) | 1253 | covered_remove = bb.utils.better_eval(call, locs) |
@@ -1607,7 +1607,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute): | |||
1607 | sq_taskname.append(taskname) | 1607 | sq_taskname.append(taskname) |
1608 | sq_task.append(task) | 1608 | sq_task.append(task) |
1609 | call = self.rq.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)" | 1609 | call = self.rq.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)" |
1610 | locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.configuration.data } | 1610 | locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.data } |
1611 | valid = bb.utils.better_eval(call, locs) | 1611 | valid = bb.utils.better_eval(call, locs) |
1612 | 1612 | ||
1613 | valid_new = stamppresent | 1613 | valid_new = stamppresent |