diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2008-05-21 21:26:46 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-05-21 21:26:46 +0000 |
| commit | 9577a9d25f9e5af4709338268df5d5d29a010eb8 (patch) | |
| tree | 86d583178faf26a8141cebcd874c563ee0a4be61 | |
| parent | 0e1ff8f8befd09b2060499e1ccddc9bb68b41118 (diff) | |
| download | bitbake-contrib-9577a9d25f9e5af4709338268df5d5d29a010eb8.tar.gz | |
build.py: Make sure expandKeys has been called on the data dictonary before running tasks fixing various strange issues (from poky). Correctly add a task override in the form task-TASKNAME which whilst a change in behaviour shouldn't matter since the original approach didn't work at all
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | lib/bb/build.py | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -138,6 +138,8 @@ Changes in Bitbake 1.9.x: directory != the cache dir. - Add md5 and sha256 checksum generation functions to utils.py - Correctly handle '-' characters in class names (#2958) + - Make sure expandKeys has been called on the data dictonary before running tasks + - Correctly add a task override in the form task-TASKNAME. Changes in Bitbake 1.8.0: - Release 1.7.x as a stable series diff --git a/lib/bb/build.py b/lib/bb/build.py index ca7cfbc6b..b8abe6d1b 100644 --- a/lib/bb/build.py +++ b/lib/bb/build.py @@ -267,8 +267,9 @@ def exec_task(task, d): bb.msg.debug(1, bb.msg.domain.Build, "Executing task %s" % task) old_overrides = data.getVar('OVERRIDES', d, 0) localdata = data.createCopy(d) - data.setVar('OVERRIDES', 'task_%s:%s' % (task, old_overrides), localdata) + data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata) data.update_data(localdata) + data.expandKeys(localdata) event.fire(TaskStarted(task, localdata)) exec_func(task, localdata) event.fire(TaskSucceeded(task, localdata)) |