sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: merge upstream fixes and fix bug in recrdeptask handling 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1282 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2007-02-21 20:15:13 +00:00
parent 56a65b34e8
commit 23ce7821a3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bitbake/lib/bb/runqueue.py
View File

@ -152,9 +152,9 @@ class RunQueue:
# Resolve Recursive Runtime Depends
# Also includes all Build Depends (and their runtime depends)
if 'recrdeptask' in task_deps and taskData.tasks_name[task] in task_deps['recrdeptask']:
dep_seen = []
rdep_seen = []
for taskname in task_deps['recrdeptask'][taskData.tasks_name[task]].split():
dep_seen = []
rdep_seen = []
for depid in taskData.depids[fnid]:
add_recursive_build(depid)
for rdepid in taskData.rdepids[fnid]:
@ -203,6 +203,9 @@ class RunQueue:
if targetid not in taskData.build_targets:
continue
if targetid in taskData.failed_deps:
continue
fnid = taskData.build_targets[targetid][0]
# Remove stamps for targets if force mode active
@ -211,9 +214,6 @@ class RunQueue:
bb.msg.note(2, bb.msg.domain.RunQueue, "Remove stamp %s, %s" % (target[1], fn))
bb.build.del_stamp(target[1], dataCache, fn)
if targetid in taskData.failed_deps:
continue
if fnid in taskData.failed_fnids:
continue
@ -347,7 +347,7 @@ class RunQueue:
taskData.fail_fnid(fnid)
failures = failures + 1
self.reset_runqueue()
self.prepare_runqueue(cfgData, dataCache, taskData, runlist)
self.prepare_runqueue(cooker, cfgData, dataCache, taskData, runlist)
def execute_runqueue_internal(self, cooker, cfgData, dataCache, taskData):
"""
@ -369,7 +369,7 @@ class RunQueue:
if len(self.runq_fnid) == 0:
# nothing to do
return
return []
def sigint_handler(signum, frame):
raise KeyboardInterrupt