From: Richard Purdie Date: Tue, 30 Oct 2007 12:36:07 +0000 (+0000) Subject: runqueue.py: Allow multiple options for deptask flag (from poky), fix comment typo... X-Git-Tag: 1.8.10~22 X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=6b0b64c823e782327967a46e5a69b046d778f553;p=vuplus_bitbake runqueue.py: Allow multiple options for deptask flag (from poky), fix comment typo in trunk. --- diff --git a/ChangeLog b/ChangeLog index ade98e1..3f613d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ Changes in BitBake 1.8.x: - Fix 'depends' flag splitting - Fix unexport handling (#3135) - Add bb.copyfile function similar to bb.movefile (and improve movefile error reporting) + - Allow multiple options for deptask flag Changes in Bitbake 1.8.8: - Rewrite svn fetcher to make adding extra operations easier diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 339f344..2f80dd4 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -109,14 +109,15 @@ class RunQueue: # Resolve Depends if 'deptask' in task_deps and taskData.tasks_name[task] in task_deps['deptask']: - taskname = task_deps['deptask'][taskData.tasks_name[task]] + tasknames = task_deps['deptask'][taskData.tasks_name[task]].split() for depid in taskData.depids[fnid]: # Won't be in build_targets if ASSUME_PROVIDED if depid in taskData.build_targets: depdata = taskData.build_targets[depid][0] if depdata is not None: dep = taskData.fn_index[depdata] - depends.append(taskData.gettask_id(dep, taskname)) + for taskname in tasknames: + depends.append(taskData.gettask_id(dep, taskname)) # Resolve Runtime Depends if 'rdeptask' in task_deps and taskData.tasks_name[task] in task_deps['rdeptask']: