[PATCH 0/1] toaster: build missing toaster.conf settings

[PATCH 0/1] toaster: build missing toaster.conf settings

[Paul Eggleton]

Fix a regression in toaster caused by the server reworking. I believe
we will need this for the YP 2.4 release because Toaster configuration
is broken without it.


The following changes since commit 41ba3c8bfcd3501604f6a17bd327a8193b11b656:

  bitbake-user-manual: Updated kernel version in PREFERRED_VERSION example (2017-09-26 15:42:45 +0100)

are available in the git repository at:

  git://git.openembedded.org/bitbake-contrib paule/toaster-fix
  http://cgit.openembedded.org/bitbake-contrib/log/?h=paule/toaster-fix

David Reyna (1):
  toaster: build missing toaster.conf settings

 lib/toaster/bldcontrol/localhostbecontroller.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.9.5

[PATCH 1/1] toaster: build missing toaster.conf settings

[Paul Eggleton]

From: David Reyna <David.Reyna@windriver.com>

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>
---
 lib/toaster/bldcontrol/localhostbecontroller.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index a2ca95b..83cb703 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. '
-- 
2.9.5

Re: [PATCH 1/1] toaster: build missing toaster.conf settings

[Mardegan, Alberto]

Hi,

> diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
> index a2ca95b..83cb703 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,

better add quotes around the %s in the --read parameters, as these paths
might contain spaces.

Ciao,
  Alberto

________________________________

This e-mail and any attachment(s) are intended only for the recipient(s) named above and others who have been specifically authorized to receive them. They may contain confidential information. If you are not the intended recipient, please do not read this email or its attachment(s). Furthermore, you are hereby notified that any dissemination, distribution or copying of this e-mail and any attachment(s) is strictly prohibited. If you have received this e-mail in error, please immediately notify the sender by replying to this e-mail and then delete this e-mail and any attachment(s) or copies thereof from your system. Thank you.