summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-09-02 17:26:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-04 13:18:49 (GMT)
commite63c5775732055a32b417c01fb68711f33ff4ac3 (patch)
tree8a880555e0d13b0ab1df9b120608f06f0d1ab54d /bitbake
parent12d003a80031304775b031002c75c64c53f7a7f9 (diff)
downloadpoky-e63c5775732055a32b417c01fb68711f33ff4ac3.tar.gz
bitbake: 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]. (Bitbake rev: 92940b0427d9b2b3f95e27c230ec1e36638a34bc) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake-worker1
-rw-r--r--bitbake/lib/bb/runqueue.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index b438d98..2f21e7c 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -147,6 +147,7 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, quieterror
147 os.umask(umask) 147 os.umask(umask)
148 148
149 data.setVar("BB_WORKERCONTEXT", "1") 149 data.setVar("BB_WORKERCONTEXT", "1")
150 data.setVar("BUILDNAME", workerdata["buildname"])
150 bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"]) 151 bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"])
151 ret = 0 152 ret = 0
152 try: 153 try:
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 0700a5b..8d36f28 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -852,6 +852,7 @@ class RunQueue:
852 "logdefaultverboselogs" : bb.msg.loggerVerboseLogs, 852 "logdefaultverboselogs" : bb.msg.loggerVerboseLogs,
853 "logdefaultdomain" : bb.msg.loggerDefaultDomains, 853 "logdefaultdomain" : bb.msg.loggerDefaultDomains,
854 "prhost" : self.cooker.prhost, 854 "prhost" : self.cooker.prhost,
855 "buildname" : self.cfgData.getVar("BUILDNAME", True),
855 } 856 }
856 857
857 worker.stdin.write("<cookerconfig>" + pickle.dumps(self.cooker.configuration) + "</cookerconfig>") 858 worker.stdin.write("<cookerconfig>" + pickle.dumps(self.cooker.configuration) + "</cookerconfig>")