[rtems-source-builder commit] sb/setbuilder: Install the build when stagging or configured to install
Chris Johns
chrisj at rtems.org
Mon Sep 19 21:24:51 UTC 2022
Module: rtems-source-builder
Branch: 5
Commit: 6afc04b3328351c34d961e8bd6441aaddbeb3c0a
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=6afc04b3328351c34d961e8bd6441aaddbeb3c0a
Author: Chris Johns <chrisj at rtems.org>
Date: Fri Sep 16 16:55:41 2022 +1000
sb/setbuilder: Install the build when stagging or configured to install
Updates #4716
---
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 1452aca..9836e9b 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 ...
More information about the vc
mailing list