[oe-commits] [bitbake] 01/03: toaster: build missing toaster.conf settings

git at git.openembedded.org git at git.openembedded.org
Fri Oct 6 11:07:16 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit fa767d85f19a7af92a44fe11fdfb38633009ad71
Author: David Reyna <David.Reyna at windriver.com>
AuthorDate: Fri Oct 6 12:06:54 2017 +1300

    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 <David.Reyna at windriver.com>
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 a2ca95b..83cb703 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. '

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list