From fa767d85f19a7af92a44fe11fdfb38633009ad71 Mon Sep 17 00:00:00 2001 From: David Reyna Date: Fri, 6 Oct 2017 12:06:54 +1300 Subject: 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] Signed-off-by: David Reyna Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- lib/toaster/bldcontrol/localhostbecontroller.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py index a2ca95bf4..83cb7039f 100644 --- a/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/lib/toaster/bldcontrol/localhostbecontroller.py @@ -381,9 +381,10 @@ class LocalhostBEController(BuildEnvironmentController): local_bitbake = os.path.join(os.path.dirname(os.getenv('BBBASEDIR')), 'bitbake') self._shellcmd(['bash -c \"(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:%s" ' - '%s %s -u toasterui --token="" >>%s 2>&1;' + '%s %s -u toasterui --read %s --read %s --token="" >>%s 2>&1;' 'BITBAKE_UI="knotty" BBSERVER=0.0.0.0:%s %s -m)&\"' \ - % (brbe, self.be.bbport, local_bitbake, bbtargets, log, self.be.bbport, bitbake)], + % (brbe, self.be.bbport, local_bitbake, bbtargets, confpath, toasterlayers, log, + self.be.bbport, bitbake,)], builddir, nowait=True) logger.debug('localhostbecontroller: Build launched, exiting. ' -- cgit 1.2.3-korg