diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-09-02 18:26:28 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-04 14:18:22 +0100 |
| commit | 92940b0427d9b2b3f95e27c230ec1e36638a34bc (patch) | |
| tree | d9df94c2f92cdec671c773e996d77ae884c40472 | |
| parent | dce0f9d4afe0986e2dd0146944fc4ac9dde275e4 (diff) | |
| download | bitbake-92940b0427d9b2b3f95e27c230ec1e36638a34bc.tar.gz | |
bitbake-worker: ensure BUILDNAME is available during execution
BUILDNAME is set from cooker by default, so since the worker split it
will not be set when executing functions. In OpenEmbedded this results
in /etc/version (which is populated from BUILDNAME) not having any
content. Pass this variable value through to the worker explicitly to
fix the issue.
Fixes [YOCTO #4818].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | bin/bitbake-worker | 1 | ||||
| -rw-r--r-- | lib/bb/runqueue.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/bin/bitbake-worker b/bin/bitbake-worker index b438d98dc..2f21e7c66 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -147,6 +147,7 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, quieterror os.umask(umask) data.setVar("BB_WORKERCONTEXT", "1") + data.setVar("BUILDNAME", workerdata["buildname"]) bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"]) ret = 0 try: diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 0700a5bf7..8d36f282c 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -852,6 +852,7 @@ class RunQueue: "logdefaultverboselogs" : bb.msg.loggerVerboseLogs, "logdefaultdomain" : bb.msg.loggerDefaultDomains, "prhost" : self.cooker.prhost, + "buildname" : self.cfgData.getVar("BUILDNAME", True), } worker.stdin.write("<cookerconfig>" + pickle.dumps(self.cooker.configuration) + "</cookerconfig>") |