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/set-builder: Fix staging and tar file generation with a single config build

Browse Source 
Closes #4730
This commit is contained in:
Chris Johns
2022-09-29 18:51:17 +10:00
parent 161b7f108c
commit 336f15cc75
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,27 +433,19 @@ class buildset:
interrupted = False interrupted = False
# #
# If this is the outter most buildset it's files are installed. Nested # If installing switch to staging. Not sure if this is still
# build sets staged their installed file. The staged files are install # needed.
# when the outtter most build finishes.
# #
if nesting_count != 1:
if self.installing(): if self.installing():
self.macros['install_mode'] = 'staging' 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
try: try:
configs = self.load() configs = self.load()
log.trace('_bset: %2d: %s: configs: %s' % (nesting_count, log.trace('_bset: %2d: %s: configs: %s' % (nesting_count,
self.bset, ', '.join(configs))) self.bset, ', '.join(configs)))
if nesting_count == 1 and len(configs) > 1: if nesting_count == 1:
# #
# Prepend staging areas, bin directory to the # Prepend staging areas, bin directory to the
# path. Lets the later package depend on the earlier # path. Lets the later package depend on the earlier
@@ -485,8 +477,6 @@ class buildset:
'=' * (74 - len(configs[s])))) '=' * (74 - len(configs[s]))))
bs = buildset(configs[s], self.configs, opts, macros) bs = buildset(configs[s], self.configs, opts, macros)
bs.build(deps, nesting_count, mail) bs.build(deps, nesting_count, mail)
if self.installing():
have_staging = True
del bs del bs
elif configs[s].endswith('.cfg'): elif configs[s].endswith('.cfg'):
if mail: if mail:
@@ -620,7 +610,7 @@ class buildset:
# #
# If builds have been staged install into the final prefix. # 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}') stagingroot = macro_expand(self.macros, '%{stagingroot}')
have_stagingroot = path.exists(stagingroot) have_stagingroot = path.exists(stagingroot)
do_install = not self.opts.no_install() do_install = not self.opts.no_install()