diff options
| author | Simon Glass <sjg@chromium.org> | 2023-07-20 02:48:43 +0300 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2023-07-24 18:34:11 +0300 |
| commit | 372b44589f243083ab883358cb7751a5e9f32939 (patch) | |
| tree | b0a8bb0294ac5a6ab1a8f8bc97660d20b550ea6c /tools/buildman | |
| parent | b8680646521a8f36b309cf53d2fd15f8f14a6264 (diff) | |
| download | u-boot-372b44589f243083ab883358cb7751a5e9f32939.tar.xz | |
bulldman: Set up output_dir earlier
Set up output_dir at the start of the main function, instead of updating
the options.output_dir option.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/buildman')
| -rw-r--r-- | tools/buildman/control.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 2bc235e130..b6cd9787fb 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -410,14 +410,15 @@ def do_buildman(options, args, toolchains=None, make_func=None, brds=None, toolchains = get_toolchains(toolchains, col, options.override_toolchain, options.fetch_arch, options.list_tool_chains, options.verbose) - if not options.output_dir: + output_dir = options.output_dir + if not output_dir: if options.work_in_output: sys.exit(col.build(col.RED, '-w requires that you specify -o')) - options.output_dir = '..' + output_dir = '..' # Work out what subset of the boards we are building if not brds: - brds = get_boards_obj(options.output_dir, options.regen_board_list, + brds = get_boards_obj(output_dir, options.regen_board_list, options.maintainer_check, options.threads, options.verbose) if isinstance(brds, int): @@ -460,13 +461,12 @@ def do_buildman(options, args, toolchains=None, make_func=None, brds=None, options.branch) # Create a new builder with the selected options. - output_dir = options.output_dir if options.branch: dirname = options.branch.replace('/', '_') # As a special case allow the board directory to be placed in the # output directory itself rather than any subdirectory. if not options.no_subdirs: - output_dir = os.path.join(options.output_dir, dirname) + output_dir = os.path.join(output_dir, dirname) if clean_dir and os.path.exists(output_dir): shutil.rmtree(output_dir) |