[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7989/8267] bitbake: toaster: build missing toaster.conf settings

[Emmanuele Bassi <ebassi src gnome org>]

commit 3eb62b0d700a05c923c5cd96f0c3377202c1e0da
Author: David Reyna <David Reyna windriver com>
Date:   Fri Oct 6 12:06:54 2017 +1300

    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>

 .../toaster/bldcontrol/localhostbecontroller.py    |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py 
b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index a2ca95b..83cb703 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. '