toaster: unset BBPATH before starting bbserver for Rocko compatibility

Submitted by Reyna, David on Nov. 18, 2017, 6:51 a.m. | Patch ID: 145982

Details

Message ID 1510987875-8910-1-git-send-email-david.reyna@windriver.com
State New
Headers show

Commit Message

Reyna, David Nov. 18, 2017, 6:51 a.m.
From: David Reyna <David.Reyna@windriver.com>

The latest build enviroment script is now setting BBPATH. This breaks
building Rocko projects from a master-based Toaster because with this
newly inherited BBPATH value, the 'bitbake.lock' file ends up in the
Toaster build directory instead of the project's build directory.

Toaster should always clear BBPATH so that the bbserver's environment
is clean (enough).

[YOCTO #12363]

Signed-off-by: David Reyna <David.Reyna@windriver.com>
---
 bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 83cb703..48849c8 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -332,10 +332,10 @@  class LocalhostBEController(BuildEnvironmentController):
                 conf.write('%s="%s"\n' % (var.name, var.value))
             conf.write('INHERIT+="toaster buildhistory"')
 
-        # run bitbake server from the clone
+        # run bitbake server from the clone (with clean BBPATH)
         bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake')
         toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf")
-        self._shellcmd('bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s '
+        self._shellcmd('unset BBPATH; bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s '
                        '--server-only -B 0.0.0.0:0\"' % (oe_init,
                        builddir, bitbake, confpath, toasterlayers), self.be.sourcedir)