diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-10-30 12:03:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-10-30 12:03:07 +0000 |
| commit | 14fb92c008ae01692a943c1d035b790101aeb2af (patch) | |
| tree | 82a88a43d60808b8e8fd624fffb7d476fc466bb6 /bitbake/lib/bb/runqueue.py | |
| parent | c9be325eb9b3140dad277bfda03a34e7b2cf7fdb (diff) | |
| download | poky-14fb92c008ae01692a943c1d035b790101aeb2af.tar.gz | |
bitbake runqueue.py: Allow multiple options for deptask flag (from poky), fix comment typo.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3041 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index f245fd6c1d..2f80dd4c88 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
| @@ -109,14 +109,15 @@ class RunQueue: | |||
| 109 | 109 | ||
| 110 | # Resolve Depends | 110 | # Resolve Depends |
| 111 | if 'deptask' in task_deps and taskData.tasks_name[task] in task_deps['deptask']: | 111 | if 'deptask' in task_deps and taskData.tasks_name[task] in task_deps['deptask']: |
| 112 | taskname = task_deps['deptask'][taskData.tasks_name[task]] | 112 | tasknames = task_deps['deptask'][taskData.tasks_name[task]].split() |
| 113 | for depid in taskData.depids[fnid]: | 113 | for depid in taskData.depids[fnid]: |
| 114 | # Won't be in build_targets if ASSUME_PROVIDED | 114 | # Won't be in build_targets if ASSUME_PROVIDED |
| 115 | if depid in taskData.build_targets: | 115 | if depid in taskData.build_targets: |
| 116 | depdata = taskData.build_targets[depid][0] | 116 | depdata = taskData.build_targets[depid][0] |
| 117 | if depdata is not None: | 117 | if depdata is not None: |
| 118 | dep = taskData.fn_index[depdata] | 118 | dep = taskData.fn_index[depdata] |
| 119 | depends.append(taskData.gettask_id(dep, taskname)) | 119 | for taskname in tasknames: |
| 120 | depends.append(taskData.gettask_id(dep, taskname)) | ||
| 120 | 121 | ||
| 121 | # Resolve Runtime Depends | 122 | # Resolve Runtime Depends |
| 122 | if 'rdeptask' in task_deps and taskData.tasks_name[task] in task_deps['rdeptask']: | 123 | if 'rdeptask' in task_deps and taskData.tasks_name[task] in task_deps['rdeptask']: |
| @@ -375,7 +376,7 @@ class RunQueue: | |||
| 375 | bb.msg.fatal(bb.msg.domain.RunQueue, "Task %s (%s) count not zero!" % (task, self.get_user_idstring(task))) | 376 | bb.msg.fatal(bb.msg.domain.RunQueue, "Task %s (%s) count not zero!" % (task, self.get_user_idstring(task))) |
| 376 | 377 | ||
| 377 | 378 | ||
| 378 | # Check for mulitple taska building the same provider | 379 | # Check for multiple tasks building the same provider |
| 379 | prov_list = {} | 380 | prov_list = {} |
| 380 | seen_fn = [] | 381 | seen_fn = [] |
| 381 | for task in range(len(self.runq_fnid)): | 382 | for task in range(len(self.runq_fnid)): |
