diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-16 15:14:13 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-16 15:14:13 +0000 |
commit | ace52b0da36d2909c1aaf344ff5f321a8de777ba (patch) | |
tree | a421a22c93c94aa2dc9f4d02a2c637993368dfd7 /bitbake/lib/bb/runqueue.py | |
parent | e497b89cf3325d82fb2f96df92af019c7d487a09 (diff) | |
download | poky-ace52b0da36d2909c1aaf344ff5f321a8de777ba.tar.gz |
bitbake/runqueue.py: We should just failoutright in scenequeue for noexec tasks, not skip them so stamps are created
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index d605b310ff..9b75dff00e 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -909,9 +909,13 @@ class RunQueue: | |||
909 | if t3 and t3 > t2: | 909 | if t3 and t3 > t2: |
910 | continue | 910 | continue |
911 | if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): | 911 | if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): |
912 | if not t2 or t1 < t2: | 912 | if not t2: |
913 | bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s < %s (or does not exist)" % (stampfile, stampfile2)) | 913 | bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s does not exist" % (stampfile2)) |
914 | iscurrent = False | 914 | iscurrent = False |
915 | if t1 < t2: | ||
916 | bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s < %s" % (stampfile, stampfile2)) | ||
917 | iscurrent = False | ||
918 | |||
915 | return iscurrent | 919 | return iscurrent |
916 | 920 | ||
917 | def execute_runqueue(self): | 921 | def execute_runqueue(self): |
@@ -1368,7 +1372,6 @@ class RunQueueExecuteScenequeue(RunQueueExecute): | |||
1368 | taskdep = self.rqdata.dataCache.task_deps[fn] | 1372 | taskdep = self.rqdata.dataCache.task_deps[fn] |
1369 | if 'noexec' in taskdep and taskname in taskdep['noexec']: | 1373 | if 'noexec' in taskdep and taskname in taskdep['noexec']: |
1370 | noexec.append(task) | 1374 | noexec.append(task) |
1371 | self.task_skip(task) | ||
1372 | continue | 1375 | continue |
1373 | sq_fn.append(fn) | 1376 | sq_fn.append(fn) |
1374 | sq_hashfn.append(self.rqdata.dataCache.hashfn[fn]) | 1377 | sq_hashfn.append(self.rqdata.dataCache.hashfn[fn]) |
@@ -1384,7 +1387,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute): | |||
1384 | valid_new.append(sq_task[v]) | 1387 | valid_new.append(sq_task[v]) |
1385 | 1388 | ||
1386 | for task in range(len(self.sq_revdeps)): | 1389 | for task in range(len(self.sq_revdeps)): |
1387 | if task not in valid_new and task not in noexec: | 1390 | if task not in valid_new: |
1388 | 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]))) | 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]))) |
1389 | self.task_failoutright(task) | 1392 | self.task_failoutright(task) |
1390 | 1393 | ||