From c4ae028209c17dae523c1b582276050959ef74de Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 6 Apr 2016 17:46:27 +0100 Subject: bitbake: toaster: use bash explicitly Toaster can't run builds on Ubuntu as default /bin/sh points to dash there. The reason is that oe-init-build-env can't be sourced under dash for various reasons. It can be fixed or work arounded, but it wouldn't fix builds for older releases. Explicitly using bash to start builds should fix the issue. (Bitbake rev: e4352603b21d43a8b5d9ee417c036fff0a263d40) Signed-off-by: Ed Bartosh Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'bitbake/lib/toaster/bldcontrol/localhostbecontroller.py') 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): builddir = '%s-toaster-%d' % (self.be.builddir, bitbake.req.project.id) oe_init = os.path.join(self.pokydirname, 'oe-init-build-env') # init build environment - self._shellcmd('source %s %s' % (oe_init, builddir), self.be.sourcedir) + self._shellcmd("bash -c 'source %s %s'" % (oe_init, builddir), + self.be.sourcedir) # update bblayers.conf bblconfpath = os.path.join(builddir, "conf/bblayers.conf") @@ -286,9 +287,9 @@ class LocalhostBEController(BuildEnvironmentController): # run bitbake server from the clone bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake') - self._shellcmd('source %s %s; BITBAKE_UI="" %s --read %s ' - '--server-only -t xmlrpc -B 0.0.0.0:0' % (oe_init, builddir, - bitbake, confpath), self.be.sourcedir) + self._shellcmd('bash -c \"source %s %s; BITBAKE_UI="" %s --read %s ' + '--server-only -t xmlrpc -B 0.0.0.0:0\"' % (oe_init, + builddir, bitbake, confpath), self.be.sourcedir) # read port number from bitbake.lock self.be.bbport = "" @@ -319,9 +320,9 @@ class LocalhostBEController(BuildEnvironmentController): # run build with local bitbake. stop the server after the build. log = os.path.join(builddir, 'toaster_ui.log') - self._shellcmd(['(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:-1" ' + self._shellcmd(['bash -c \"(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:-1" ' '../bitbake/bin/bitbake %s -u toasterui >>%s 2>&1;' - 'BITBAKE_UI="" BBSERVER=0.0.0.0:-1 %s -m)&' \ + 'BITBAKE_UI="" BBSERVER=0.0.0.0:-1 %s -m)&\"' \ % (brbe, bbtargets, log, bitbake)], builddir, nowait=True) -- cgit 1.2.3-korg