rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb/setbuilder: Install the build when stagging or configured to install

Browse Source
This commit is contained in:
Chris Johns 2022-09-16 16:55:41 +10:00
parent 468fc79e8c
commit f86bc1da52
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source-builder/sb/setbuilder.py
View File

@ -226,6 +226,9 @@ class buildset:
def installing(self): def installing(self):
return self.install_mode() == 'installing' return self.install_mode() == 'installing'
def installable(self):
return not self.opts.no_install() or self.staging()
def staging(self): def staging(self):
return not self.installing() return not self.installing()
@ -553,14 +556,14 @@ class buildset:
', '.join([b.name() for b in builds]))) ', '.join([b.name() for b in builds])))
if deps is None and not have_errors: if deps is None and not have_errors:
for b in builds: for b in builds:
log.trace('_bset: : %s: %r' % (self.install_mode(), log.trace('_bset: : %s: installable=%r build-installable=%r' % \
b.installable())) (self.install_mode(), self.installable(), b.installable()))
if b.installable(): if b.installable():
prefix = b.config.expand('%{_prefix}') prefix = b.config.expand('%{_prefix}')
buildroot = path.join(b.config.expand('%{buildroot}'), prefix) buildroot = path.join(b.config.expand('%{buildroot}'), prefix)
if self.staging(): if self.staging():
prefix = b.config.expand('%{stagingroot}') prefix = b.config.expand('%{stagingroot}')
if not self.opts.no_install(): if self.installable():
self.install(self.install_mode(), b.name(), buildroot, prefix) self.install(self.install_mode(), b.name(), buildroot, prefix)
# #
# Sizes ... # Sizes ...