From 82f82f9b912dadb8e3860d1ced954428193b4385 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 21 May 2008 21:26:46 +0000 Subject: [PATCH] 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 --- ChangeLog | 2 ++ lib/bb/build.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d1a6620..3cb500f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,8 @@ Changes in BitBake 1.8.x: - Add md5 and sha256 checksum generation functions to utils.py - Make sure Build Completed events are generated even when tasks fail - 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.10: - Psyco is available only for x86 - do not use it on other architectures. diff --git a/lib/bb/build.py b/lib/bb/build.py index 25c03a0..7644bf0 100644 --- a/lib/bb/build.py +++ b/lib/bb/build.py @@ -271,8 +271,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)) -- 2.7.4