diff options
| author | Chris Johns <chrisj@rtems.org> | 2022-09-29 18:51:17 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2022-09-29 18:55:15 +1000 |
| commit | 336f15cc754d994b1988c23da7137b67c454ec31 (patch) | |
| tree | 09ca653b2d8596c33ea0247978fdddf5a342d569 | |
| parent | rtems-gcc-12-newlib-head.cfg: Bump newlib hash to get extern C on resource.h (diff) | |
| download | rtems-source-builder-336f15cc754d994b1988c23da7137b67c454ec31.tar.bz2 | |
sb/set-builder: Fix staging and tar file generation with a single config build
Closes #4730
| -rw-r--r-- | source-builder/sb/setbuilder.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index 3e16111..5921eed 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -433,19 +433,11 @@ class buildset: interrupted = False # - # If this is the outter most buildset it's files are installed. Nested - # build sets staged their installed file. The staged files are install - # when the outtter most build finishes. + # If installing switch to staging. Not sure if this is still + # needed. # - if nesting_count != 1: - if self.installing(): - self.macros['install_mode'] = 'staging' - - # - # Only the outter build set can have staging to install. Get the staging - # root via the config because it could require a valid config. - # - have_staging = False + if self.installing(): + self.macros['install_mode'] = 'staging' try: configs = self.load() @@ -453,7 +445,7 @@ class buildset: log.trace('_bset: %2d: %s: configs: %s' % (nesting_count, self.bset, ', '.join(configs))) - if nesting_count == 1 and len(configs) > 1: + if nesting_count == 1: # # Prepend staging areas, bin directory to the # path. Lets the later package depend on the earlier @@ -485,8 +477,6 @@ class buildset: '=' * (74 - len(configs[s])))) bs = buildset(configs[s], self.configs, opts, macros) bs.build(deps, nesting_count, mail) - if self.installing(): - have_staging = True del bs elif configs[s].endswith('.cfg'): if mail: @@ -620,7 +610,7 @@ class buildset: # # If builds have been staged install into the final prefix. # - if have_staging and not have_errors: + if not have_errors: stagingroot = macro_expand(self.macros, '%{stagingroot}') have_stagingroot = path.exists(stagingroot) do_install = not self.opts.no_install() |