build.py: Expand data to addtask

2 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 878afadb4..a776c7794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ Changes in Bitbake 1.8.x:
 	- Fix int(0)/None confusion in runqueue.py which causes random gaps in dependency chains
 	- Fix handling of variables with expansion in the name using _append/_prepend
 	  e.g. RRECOMMENDS_${PN}_append_xyz = "abc"
+	- Expand data in addtasks
        
 
 Changes in Bitbake 1.8.6:
diff --git a/lib/bb/build.py b/lib/bb/build.py
index bcbc55eea..b50cd3ed3 100644
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -401,9 +401,13 @@ def add_task(task, deps, d):
     task_graph = data.getVar('_task_graph', d)
     if not task_graph:
         task_graph = bb.digraph()
+
+    task = data.expand(task, d)
+
     data.setVarFlag(task, 'task', 1, d)
     task_graph.addnode(task, None)
     for dep in deps:
+        dep = data.expand(dep, d)
         if not task_graph.hasnode(dep):
             task_graph.addnode(dep, None)
         task_graph.addnode(task, dep)