summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2017-10-06 12:06:54 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-07 23:20:41 +0100
commit3eb62b0d700a05c923c5cd96f0c3377202c1e0da (patch)
tree44bb0497a872e8da6c116d0a7b8d052e2784c628
parent07e3da7b399dea8fca7f923e210b9959b949f6e9 (diff)
downloadpoky-3eb62b0d700a05c923c5cd96f0c3377202c1e0da.tar.gz
bitbake: toaster: build missing toaster.conf settings
The bitbake server changed such that the Toaster custom settings from 'toaster.conf' and 'toaster-bblayers.conf' that were set when the '--server-only' mode was started were lost when the subsequent build request happened, resulting in builds missing all custom changes. This patch asserts those environment settings in both server calls. [YOCTO #12194] (Bitbake rev: fa767d85f19a7af92a44fe11fdfb38633009ad71) Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index a2ca95bf42..83cb7039fc 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -381,9 +381,10 @@ class LocalhostBEController(BuildEnvironmentController):
381 local_bitbake = os.path.join(os.path.dirname(os.getenv('BBBASEDIR')), 381 local_bitbake = os.path.join(os.path.dirname(os.getenv('BBBASEDIR')),
382 'bitbake') 382 'bitbake')
383 self._shellcmd(['bash -c \"(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:%s" ' 383 self._shellcmd(['bash -c \"(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:%s" '
384 '%s %s -u toasterui --token="" >>%s 2>&1;' 384 '%s %s -u toasterui --read %s --read %s --token="" >>%s 2>&1;'
385 'BITBAKE_UI="knotty" BBSERVER=0.0.0.0:%s %s -m)&\"' \ 385 'BITBAKE_UI="knotty" BBSERVER=0.0.0.0:%s %s -m)&\"' \
386 % (brbe, self.be.bbport, local_bitbake, bbtargets, log, self.be.bbport, bitbake)], 386 % (brbe, self.be.bbport, local_bitbake, bbtargets, confpath, toasterlayers, log,
387 self.be.bbport, bitbake,)],
387 builddir, nowait=True) 388 builddir, nowait=True)
388 389
389 logger.debug('localhostbecontroller: Build launched, exiting. ' 390 logger.debug('localhostbecontroller: Build launched, exiting. '