[PATCH 1/2] sb/setbuilder: Install the build when stagging or configured to install

[Frank Kühndel]

Hi Chris,

I checked your two patches in an opensuse leap 15.4 container building 
the tools (rtems-source-builder git) for RTEMS 6 and ARM BSP. The build 
was OK; the dependencies on "expat-devel" and "gmp-devel" are gone.

Thanks and have a nice weekend
Frank


On 9/16/22 08:59, chrisj at rtems.org wrote:
> Subject:
> [PATCH 1/2] sb/setbuilder: Install the build when stagging or configured 
> to install
> From:
> chrisj at rtems.org
> Date:
> 9/16/22, 08:59
> 
> To:
> devel at rtems.org
> 
> 
> From: Chris Johns<chrisj at rtems.org>
> 
> ---
>   source-builder/sb/setbuilder.py | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py
> index f24ac87..3e16111 100644
> --- a/source-builder/sb/setbuilder.py
> +++ b/source-builder/sb/setbuilder.py
> @@ -226,6 +226,9 @@ class buildset:
>       def installing(self):
>           return self.install_mode() == 'installing'
>   
> +    def installable(self):
> +        return not self.opts.no_install() or self.staging()
> +
>       def staging(self):
>           return not self.installing()
>   
> @@ -553,14 +556,14 @@ class buildset:
>                          ', '.join([b.name() for b in builds])))
>               if deps is None and not have_errors:
>                   for b in builds:
> -                    log.trace('_bset:   : %s: %r' % (self.install_mode(),
> -                                                     b.installable()))
> +                    log.trace('_bset:   : %s: installable=%r build-installable=%r' % \
> +                              (self.install_mode(), self.installable(), b.installable()))
>                       if b.installable():
>                           prefix = b.config.expand('%{_prefix}')
>                           buildroot = path.join(b.config.expand('%{buildroot}'), prefix)
>                           if self.staging():
>                               prefix = b.config.expand('%{stagingroot}')
> -                        if not self.opts.no_install():
> +                        if self.installable():
>                               self.install(self.install_mode(), b.name(), buildroot, prefix)
>               #
>               # Sizes ...
> -- 2.37.1 _______________________________________________ devel mailing 
> list devel at rtems.org http://lists.rtems.org/mailman/listinfo/devel
> 

-- 
embedded brains GmbH
Herr Frank KÜHNDEL
Dornierstr. 4
82178 Puchheim
Germany
email: frank.kuehndel at embedded-brains.de
phone:  +49-89-18 94 741 - 23
mobile: +49-176-15 22 06 - 11
fax:    +49-89-18 94 741 - 08

Registergericht: Amtsgericht München
Registernummer: HRB 157899
Vertretungsberechtigte Geschäftsführer: Peter Rasmussen, Thomas Dörfler
Unsere Datenschutzerklärung finden Sie hier:
https://embedded-brains.de/datenschutzerklaerung/