diff --git a/source-builder/sb/reports.py b/source-builder/sb/reports.py index 9567819..5d32501 100644 --- a/source-builder/sb/reports.py +++ b/source-builder/sb/reports.py @@ -356,6 +356,7 @@ def run(args): if opts.get_arg('--output') and len(opts.params()) > 1: raise error.general('--output can only be used with a single config') print 'RTEMS Source Builder, Reporter v%s' % (version.str()) + opts.log_info() if not check.host_setup(opts): log.warning('forcing build with known host setup problems') configs = build.get_configs(opts) diff --git a/source-builder/sb/rtemsconfig.py b/source-builder/sb/rtemsconfig.py index 1bd972a..4eaee40 100644 --- a/source-builder/sb/rtemsconfig.py +++ b/source-builder/sb/rtemsconfig.py @@ -192,6 +192,7 @@ def run(args): if opts.get_arg('--list'): log.notice('RTEMS Source Builder - RTEMS Configuration, v%s' % (version.str())) + opts.log_info() configs = bsp.keys() for c in sorted(configs.keys()): print c diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index efb8da5..7ea9f4d 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -278,7 +278,9 @@ class buildset: configs = self.parse(bset) return configs - def build(self, deps = None): + def build(self, deps = None, nesting_count = 0): + + nesting_count += 1 log.trace('_bset: %s: make' % (self.bset)) log.notice('Build Set: %s' % (self.bset)) @@ -309,13 +311,13 @@ class buildset: opts = copy.copy(self.opts) macros = copy.copy(self.macros) if configs[s].endswith('.bset'): - log.trace('_bset: %s' % ('=' * 80)) + log.trace('_bset: == %2d %s' % (nesting_count + 1, '=' * 75)) bs = buildset(configs[s], self.configs, opts, macros) - bs.build(deps) + bs.build(deps, nesting_count) del bs elif configs[s].endswith('.cfg'): mail_report = self.opts.get_arg('--mail') - log.trace('_bset: %s' % ('-' * 80)) + log.trace('_bset: -- %2d %s' % (nesting_count + 1, '-' * 75)) b = build.build(configs[s], self.opts.get_arg('--pkg-tar-files'), opts, macros) if b.macros.get('%{_disable_reporting}'): @@ -422,6 +424,7 @@ def run(): mailer.append_options(optargs) opts = options.load(sys.argv, optargs) log.notice('RTEMS Source Builder - Set Builder, v%s' % (version.str())) + opts.log_info() if not check.host_setup(opts): raise error.general('host build environment is not set up correctly') configs = build.get_configs(opts)