Ver código fonte

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

Richard Purdie 16 anos atrás
pai
commit
9577a9d25f
2 arquivos alterados com 4 adições e 1 exclusões
  1. 2 0
      ChangeLog
  2. 2 1
      lib/bb/build.py

+ 2 - 0
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

+ 2 - 1
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))