summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--lib/bb/build.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b7e0d9dc..add07201a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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))