summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/runqueue.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index bc0602700d..dcd6d1a8c0 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -875,7 +875,7 @@ class RunQueue:
875 bb.msg.fatal("RunQueue", "check_stamps fatal internal error") 875 bb.msg.fatal("RunQueue", "check_stamps fatal internal error")
876 return current 876 return current
877 877
878 def check_stamp_task(self, task, taskname = None): 878 def check_stamp_task(self, task, taskname = None, recurse = False):
879 def get_timestamp(f): 879 def get_timestamp(f):
880 try: 880 try:
881 if not os.access(f, os.F_OK): 881 if not os.access(f, os.F_OK):
@@ -930,7 +930,8 @@ class RunQueue:
930 if t1 < t2: 930 if t1 < t2:
931 logger.debug(2, 'Stampfile %s < %s', stampfile, stampfile2) 931 logger.debug(2, 'Stampfile %s < %s', stampfile, stampfile2)
932 iscurrent = False 932 iscurrent = False
933 933 if recurse and iscurrent:
934 iscurrent = self.check_stamp_task(dep, recurse=True)
934 return iscurrent 935 return iscurrent
935 936
936 def execute_runqueue(self): 937 def execute_runqueue(self):
@@ -1648,7 +1649,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
1648 fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[realtask]] 1649 fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[realtask]]
1649 1650
1650 taskname = self.rqdata.runq_task[realtask] + "_setscene" 1651 taskname = self.rqdata.runq_task[realtask] + "_setscene"
1651 if self.rq.check_stamp_task(realtask, self.rqdata.runq_task[realtask]): 1652 if self.rq.check_stamp_task(realtask, self.rqdata.runq_task[realtask], recurse = True):
1652 logger.debug(2, 'Stamp for underlying task %s(%s) is current, so skipping setscene variant', 1653 logger.debug(2, 'Stamp for underlying task %s(%s) is current, so skipping setscene variant',
1653 task, self.rqdata.get_user_idstring(realtask)) 1654 task, self.rqdata.get_user_idstring(realtask))
1654 self.task_failoutright(task) 1655 self.task_failoutright(task)