From: David Reyna Date: Thu, 5 Oct 2017 23:06:54 +0000 (+1300) Subject: bitbake: toaster: build missing toaster.conf settings X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eb62b0d700a05c923c5cd96f0c3377202c1e0da;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index a2ca95bf42f..83cb7039fc9 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/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. '