From 081c34ccdc4c08ac51242d96c51c0b68b7c07828 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Wed, 19 Jul 2023 17:48:44 -0600
Subject: [PATCH] buildman: Move output-file setup into one place
Collect the two parts of the output-file handling into single place.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
tools/buildman/control.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index b6cd9787fb..a9e5b84c4b 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -415,6 +415,13 @@ def do_buildman(options, args, toolchains=None, make_func=None, brds=None,
if options.work_in_output:
sys.exit(col.build(col.RED, '-w requires that you specify -o'))
output_dir = '..'
+ if options.branch and not options.no_subdirs:
+ # As a special case allow the board directory to be placed in the
+ # output directory itself rather than any subdirectory.
+ dirname = options.branch.replace('/', '_')
+ output_dir = os.path.join(output_dir, dirname)
+ if clean_dir and os.path.exists(output_dir):
+ shutil.rmtree(output_dir)
# Work out what subset of the boards we are building
if not brds:
@@ -461,14 +468,6 @@ def do_buildman(options, args, toolchains=None, make_func=None, brds=None,
options.branch)
# Create a new builder with the selected options.
- 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(output_dir, dirname)
- if clean_dir and os.path.exists(output_dir):
- shutil.rmtree(output_dir)
# For a dry run, just show our actions as a sanity check
if options.dry_run:
--
2.39.5