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

bitbake lib/bb/runqueue.py: Make sure intertask depends get processed correctly in recursive depends 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2368 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2007-08-05 22:43:24 +00:00
parent a354182576
commit b5aa22b972
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,7 @@ class RunQueue:
if 'deptask' in task_deps and taskData.tasks_name[task] in task_deps['deptask']: if 'deptask' in task_deps and taskData.tasks_name[task] in task_deps['deptask']:
taskname = task_deps['deptask'][taskData.tasks_name[task]] taskname = task_deps['deptask'][taskData.tasks_name[task]]
for depid in taskData.depids[fnid]: for depid in taskData.depids[fnid]:
# Won't be in build_targets if ASSUME_PROVIDED
if depid in taskData.build_targets: if depid in taskData.build_targets:
depdata = taskData.build_targets[depid][0] depdata = taskData.build_targets[depid][0]
if depdata: if depdata:
@ -130,6 +131,7 @@ class RunQueue:
for idepend in idepends: for idepend in idepends:
depid = int(idepend.split(":")[0]) depid = int(idepend.split(":")[0])
if depid in taskData.build_targets: if depid in taskData.build_targets:
# Won't be in build_targets if ASSUME_PROVIDED
depdata = taskData.build_targets[depid][0] depdata = taskData.build_targets[depid][0]
if depdata: if depdata:
dep = taskData.fn_index[depdata] dep = taskData.fn_index[depdata]
@ -161,6 +163,11 @@ class RunQueue:
for nextdepid in taskData.rdepids[fnid]: for nextdepid in taskData.rdepids[fnid]:
if nextdepid not in rdep_seen: if nextdepid not in rdep_seen:
add_recursive_run(nextdepid) add_recursive_run(nextdepid)
idepends = taskData.tasks_idepends[depid]
for idepend in idepends:
nextdepid = int(idepend.split(":")[0])
if nextdepid not in dep_seen:
add_recursive_build(nextdepid)
def add_recursive_run(rdepid): def add_recursive_run(rdepid):
""" """
@ -188,18 +195,27 @@ class RunQueue:
for nextdepid in taskData.rdepids[fnid]: for nextdepid in taskData.rdepids[fnid]:
if nextdepid not in rdep_seen: if nextdepid not in rdep_seen:
add_recursive_run(nextdepid) add_recursive_run(nextdepid)
idepends = taskData.tasks_idepends[rdepid]
for idepend in idepends:
nextdepid = int(idepend.split(":")[0])
if nextdepid not in dep_seen:
add_recursive_build(nextdepid)
# Resolve Recursive Runtime Depends # Resolve Recursive Runtime Depends
# Also includes all Build Depends (and their runtime depends) # Also includes all thier build depends, intertask depends and runtime depends
if 'recrdeptask' in task_deps and taskData.tasks_name[task] in task_deps['recrdeptask']: if 'recrdeptask' in task_deps and taskData.tasks_name[task] in task_deps['recrdeptask']:
for taskname in task_deps['recrdeptask'][taskData.tasks_name[task]].split(): for taskname in task_deps['recrdeptask'][taskData.tasks_name[task]].split():
dep_seen = [] dep_seen = []
rdep_seen = [] rdep_seen = []
idep_seen = []
for depid in taskData.depids[fnid]: for depid in taskData.depids[fnid]:
add_recursive_build(depid) add_recursive_build(depid)
for rdepid in taskData.rdepids[fnid]: for rdepid in taskData.rdepids[fnid]:
add_recursive_run(rdepid) add_recursive_run(rdepid)
for idepend in idepends:
depid = int(idepend.split(":")[0])
add_recursive_build(depid)
#Prune self references #Prune self references
if task in depends: if task in depends: