summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 6d7f433f9f..73c5f1ff80 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -258,7 +258,8 @@ class LocalhostBEController(BuildEnvironmentController):
258 builddir = '%s-toaster-%d' % (self.be.builddir, bitbake.req.project.id) 258 builddir = '%s-toaster-%d' % (self.be.builddir, bitbake.req.project.id)
259 oe_init = os.path.join(self.pokydirname, 'oe-init-build-env') 259 oe_init = os.path.join(self.pokydirname, 'oe-init-build-env')
260 # init build environment 260 # init build environment
261 self._shellcmd('source %s %s' % (oe_init, builddir), self.be.sourcedir) 261 self._shellcmd("bash -c 'source %s %s'" % (oe_init, builddir),
262 self.be.sourcedir)
262 263
263 # update bblayers.conf 264 # update bblayers.conf
264 bblconfpath = os.path.join(builddir, "conf/bblayers.conf") 265 bblconfpath = os.path.join(builddir, "conf/bblayers.conf")
@@ -286,9 +287,9 @@ class LocalhostBEController(BuildEnvironmentController):
286 287
287 # run bitbake server from the clone 288 # run bitbake server from the clone
288 bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake') 289 bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake')
289 self._shellcmd('source %s %s; BITBAKE_UI="" %s --read %s ' 290 self._shellcmd('bash -c \"source %s %s; BITBAKE_UI="" %s --read %s '
290 '--server-only -t xmlrpc -B 0.0.0.0:0' % (oe_init, builddir, 291 '--server-only -t xmlrpc -B 0.0.0.0:0\"' % (oe_init,
291 bitbake, confpath), self.be.sourcedir) 292 builddir, bitbake, confpath), self.be.sourcedir)
292 293
293 # read port number from bitbake.lock 294 # read port number from bitbake.lock
294 self.be.bbport = "" 295 self.be.bbport = ""
@@ -319,9 +320,9 @@ class LocalhostBEController(BuildEnvironmentController):
319 320
320 # run build with local bitbake. stop the server after the build. 321 # run build with local bitbake. stop the server after the build.
321 log = os.path.join(builddir, 'toaster_ui.log') 322 log = os.path.join(builddir, 'toaster_ui.log')
322 self._shellcmd(['(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:-1" ' 323 self._shellcmd(['bash -c \"(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:-1" '
323 '../bitbake/bin/bitbake %s -u toasterui >>%s 2>&1;' 324 '../bitbake/bin/bitbake %s -u toasterui >>%s 2>&1;'
324 'BITBAKE_UI="" BBSERVER=0.0.0.0:-1 %s -m)&' \ 325 'BITBAKE_UI="" BBSERVER=0.0.0.0:-1 %s -m)&\"' \
325 % (brbe, bbtargets, log, bitbake)], builddir, 326 % (brbe, bbtargets, log, bitbake)], builddir,
326 nowait=True) 327 nowait=True)
327 328