summaryrefslogtreecommitdiffstats
path: root/bitbake/bin/bitbake-worker
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/bin/bitbake-worker')
-rwxr-xr-xbitbake/bin/bitbake-worker7
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index ff20c1ca98..bc13b4f314 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -81,7 +81,7 @@ def workerlog_write(msg):
81 lf.write(msg) 81 lf.write(msg)
82 lf.flush() 82 lf.flush()
83 83
84def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, quieterrors=False): 84def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdata, quieterrors=False):
85 # We need to setup the environment BEFORE the fork, since 85 # We need to setup the environment BEFORE the fork, since
86 # a fork() or exec*() activates PSEUDO... 86 # a fork() or exec*() activates PSEUDO...
87 87
@@ -148,6 +148,7 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, quieterror
148 os.umask(umask) 148 os.umask(umask)
149 149
150 data.setVar("BB_WORKERCONTEXT", "1") 150 data.setVar("BB_WORKERCONTEXT", "1")
151 data.setVar("BB_TASKDEPDATA", taskdepdata)
151 data.setVar("BUILDNAME", workerdata["buildname"]) 152 data.setVar("BUILDNAME", workerdata["buildname"])
152 data.setVar("DATE", workerdata["date"]) 153 data.setVar("DATE", workerdata["date"])
153 data.setVar("TIME", workerdata["time"]) 154 data.setVar("TIME", workerdata["time"])
@@ -300,10 +301,10 @@ class BitbakeWorker(object):
300 sys.exit(0) 301 sys.exit(0)
301 302
302 def handle_runtask(self, data): 303 def handle_runtask(self, data):
303 fn, task, taskname, quieterrors, appends = pickle.loads(data) 304 fn, task, taskname, quieterrors, appends, taskdepdata = pickle.loads(data)
304 workerlog_write("Handling runtask %s %s %s\n" % (task, fn, taskname)) 305 workerlog_write("Handling runtask %s %s %s\n" % (task, fn, taskname))
305 306
306 pid, pipein, pipeout = fork_off_task(self.cookercfg, self.data, self.workerdata, fn, task, taskname, appends, quieterrors) 307 pid, pipein, pipeout = fork_off_task(self.cookercfg, self.data, self.workerdata, fn, task, taskname, appends, taskdepdata, quieterrors)
307 308
308 self.build_pids[pid] = task 309 self.build_pids[pid] = task
309 self.build_pipes[pid] = runQueueWorkerPipe(pipein, pipeout) 310 self.build_pipes[pid] = runQueueWorkerPipe(pipein, pipeout)