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>
This commit is contained in:
parent
12d003a800
commit
e63c577573
|
@ -147,6 +147,7 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, quieterror
|
||||||
os.umask(umask)
|
os.umask(umask)
|
||||||
|
|
||||||
data.setVar("BB_WORKERCONTEXT", "1")
|
data.setVar("BB_WORKERCONTEXT", "1")
|
||||||
|
data.setVar("BUILDNAME", workerdata["buildname"])
|
||||||
bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"])
|
bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"])
|
||||||
ret = 0
|
ret = 0
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -852,6 +852,7 @@ class RunQueue:
|
||||||
"logdefaultverboselogs" : bb.msg.loggerVerboseLogs,
|
"logdefaultverboselogs" : bb.msg.loggerVerboseLogs,
|
||||||
"logdefaultdomain" : bb.msg.loggerDefaultDomains,
|
"logdefaultdomain" : bb.msg.loggerDefaultDomains,
|
||||||
"prhost" : self.cooker.prhost,
|
"prhost" : self.cooker.prhost,
|
||||||
|
"buildname" : self.cfgData.getVar("BUILDNAME", True),
|
||||||
}
|
}
|
||||||
|
|
||||||
worker.stdin.write("<cookerconfig>" + pickle.dumps(self.cooker.configuration) + "</cookerconfig>")
|
worker.stdin.write("<cookerconfig>" + pickle.dumps(self.cooker.configuration) + "</cookerconfig>")
|
||||||
|
|
Loading…
Reference in New Issue