From: Paul Eggleton Date: Mon, 2 Sep 2013 17:26:28 +0000 (+0100) Subject: bitbake-worker: ensure BUILDNAME is available during execution X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92940b0427d9b2b3f95e27c230ec1e36638a34bc;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/bin/bitbake-worker b/bin/bitbake-worker index b438d98dc92..2f21e7c662d 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 0700a5bf710..8d36f282ccb 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("" + pickle.dumps(self.cooker.configuration) + "")