sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 <ed.bartosh@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh 2016-04-06 17:46:27 +01:00 committed by Richard Purdie
parent 4adddfde44
commit c4ae028209
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
View File

@ -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)