diff options
| author |   David Reyna <David.Reyna@windriver.com> | 2017-10-05 13:04:41 -0700 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-10-06 12:05:25 +1300 |
| commit | 68417f805b782bb5e35ce413542b85898149fdbc (patch) | |
| tree | ae94dcf6d60bd1bb8f3dce005822954f76e79f3b | |
| parent | 41ba3c8bfcd3501604f6a17bd327a8193b11b656 (diff) | |
| download | bitbake-contrib-paule/toaster-fix.tar.gz | |
toaster: build missing toaster.conf settingspaule/toaster-fix
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@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
| -rw-r--r-- | lib/toaster/bldcontrol/localhostbecontroller.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py index a2ca95bf4..83cb7039f 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. ' |