summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-12-17 10:46:33 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-17 10:47:02 +0000
commita86f960f651c561bb104723aa0b4cd0922a3425a (patch)
tree19c31b662a520197b4c9221f1138b5d85b803a24
parent56ef2a01beffb0534a6c1f9b1efc0e5f7524ddf1 (diff)
downloadpoky-a86f960f651c561bb104723aa0b4cd0922a3425a.tar.gz
bitbake/runqueue: Revert previous setscene noexec changes and ensure setscene stamp exists for setscene noexec tasks
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/runqueue.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index e111b5a591..09f9ac11f8 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1372,6 +1372,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
1372 taskdep = self.rqdata.dataCache.task_deps[fn] 1372 taskdep = self.rqdata.dataCache.task_deps[fn]
1373 if 'noexec' in taskdep and taskname in taskdep['noexec']: 1373 if 'noexec' in taskdep and taskname in taskdep['noexec']:
1374 noexec.append(task) 1374 noexec.append(task)
1375 self.task_skip(task)
1376 bb.build.make_stamp(taskname + "_setscene", self.rqdata.dataCache, fn)
1375 continue 1377 continue
1376 sq_fn.append(fn) 1378 sq_fn.append(fn)
1377 sq_hashfn.append(self.rqdata.dataCache.hashfn[fn]) 1379 sq_hashfn.append(self.rqdata.dataCache.hashfn[fn])
@@ -1387,7 +1389,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
1387 valid_new.append(sq_task[v]) 1389 valid_new.append(sq_task[v])
1388 1390
1389 for task in range(len(self.sq_revdeps)): 1391 for task in range(len(self.sq_revdeps)):
1390 if task not in valid_new: 1392 if task not in valid_new and task not in noexec:
1391 bb.msg.debug(2, bb.msg.domain.RunQueue, "No package found so skipping setscene task %s" % (self.rqdata.get_user_idstring(self.rqdata.runq_setscene[task]))) 1393 bb.msg.debug(2, bb.msg.domain.RunQueue, "No package found so skipping setscene task %s" % (self.rqdata.get_user_idstring(self.rqdata.runq_setscene[task])))
1392 self.task_failoutright(task) 1394 self.task_failoutright(task)
1393 1395