bitbake: runqueue: Allow taskname to be passed to check_stamp_task()

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2010-07-06 17:47:43 +01:00
parent 009343b2a2
commit 8c23850453
1 changed files with 5 additions and 4 deletions

View File

@ -776,7 +776,7 @@ class RunQueue:
bb.msg.fatal(bb.msg.domain.RunQueue, "check_stamps fatal internal error") bb.msg.fatal(bb.msg.domain.RunQueue, "check_stamps fatal internal error")
return current return current
def check_stamp_task(self, task): def check_stamp_task(self, task, taskname = None):
if self.stamppolicy == "perfile": if self.stamppolicy == "perfile":
fulldeptree = False fulldeptree = False
@ -787,7 +787,8 @@ class RunQueue:
stampwhitelist = self.stampfnwhitelist stampwhitelist = self.stampfnwhitelist
fn = self.taskData.fn_index[self.runq_fnid[task]] fn = self.taskData.fn_index[self.runq_fnid[task]]
taskname = self.runq_task[task] if taskname is None:
taskname = self.runq_task[task]
stampfile = "%s.%s" % (self.dataCache.stamp[fn], taskname) stampfile = "%s.%s" % (self.dataCache.stamp[fn], taskname)
# If the stamp is missing its not current # If the stamp is missing its not current
if not os.access(stampfile, os.F_OK): if not os.access(stampfile, os.F_OK):
@ -928,12 +929,12 @@ class RunQueue:
while True: while True:
task = None task = None
if self.stats.active < self.number_tasks: if self.stats.active < self.number_tasks:
task = next(self.sched) task = self.sched.next()
if task is not None: if task is not None:
fn = self.taskData.fn_index[self.runq_fnid[task]] fn = self.taskData.fn_index[self.runq_fnid[task]]
taskname = self.runq_task[task] taskname = self.runq_task[task]
if self.check_stamp_task(task): if self.check_stamp_task(task, taskname):
bb.msg.debug(2, bb.msg.domain.RunQueue, "Stamp current task %s (%s)" % (task, self.get_user_idstring(task))) bb.msg.debug(2, bb.msg.domain.RunQueue, "Stamp current task %s (%s)" % (task, self.get_user_idstring(task)))
self.runq_running[task] = 1 self.runq_running[task] = 1
self.runq_buildable[task] = 1 self.runq_buildable[task] = 1