Changeset 953b839 in rtems-source-builder


Ignore:
Timestamp:
09/30/22 07:07:10 (2 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
652822f
Parents:
e04c841
git-author:
Chris Johns <chrisj@…> (09/30/22 07:07:10)
git-committer:
Chris Johns <chrisj@…> (09/30/22 20:32:24)
Message:

sb/set-bulder: Fix installing builds when a single buildset

  • Always stage a build
  • Install if installable and outter most buildset instance

Closes #4730

File:
1 edited

Legend:

Unmodified
Added
Removed
  • source-builder/sb/setbuilder.py

    re04c841 r953b839  
    228228
    229229    def installable(self):
    230         return not self.opts.no_install() or self.staging()
     230        return not self.opts.no_install() and self.installing()
    231231
    232232    def staging(self):
     
    437437        # needed.
    438438        #
    439         if self.installing():
     439        if nesting_count > 1 and self.installing():
    440440            self.macros['install_mode'] = 'staging'
    441441
     
    539539            # Installing or staging ...
    540540            #
    541             log.trace('_bset: %2d: %s: deps:%r no-install:%r' % \
     541            log.trace('_bset: %2d: mode: %s: deps:%r no-install:%r' % \
    542542                      (nesting_count, self.install_mode(),
    543543                       deps is None, self.opts.no_install()))
    544             log.trace('_bset: %2d: %s: builds: %s' % \
     544            log.trace('_bset: %2d: mode: %s: builds: %s' % \
    545545                      (nesting_count, self.install_mode(),
    546546                       ', '.join([b.name() for b in builds])))
     
    552552                        prefix = b.config.expand('%{_prefix}')
    553553                        buildroot = path.join(b.config.expand('%{buildroot}'), prefix)
    554                         if self.staging():
    555                             prefix = b.config.expand('%{stagingroot}')
     554                        self.install('staging', b.name(), buildroot, b.config.expand('%{stagingroot}'))
    556555                        if self.installable():
    557                             self.install(self.install_mode(), b.name(), buildroot, prefix)
     556                            self.install('installing', b.name(), buildroot, prefix)
    558557            #
    559558            # Sizes ...
     
    611610            # If builds have been staged install into the final prefix.
    612611            #
    613             if not have_errors:
     612            if self.installing() and not have_errors:
    614613                stagingroot = macro_expand(self.macros, '%{stagingroot}')
    615614                have_stagingroot = path.exists(stagingroot)
Note: See TracChangeset for help on using the changeset viewer.