buildman: Add an option to flatten output directory trees

[people/ms/u-boot.git] / tools / buildman / control.py

diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index cec02c6d5391f3c72bf5bda36a03f8f03e4aa57f..747c80d76a57d2c6f5f0e80ea5f9e242ae93430a 100644 (file)
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -211,12 +211,16 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
     output_dir = options.output_dir
     if options.branch:
         dirname = options.branch.replace('/', '_')
-        output_dir = os.path.join(options.output_dir, dirname)
+        # 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)
     if clean_dir and os.path.exists(output_dir):
         shutil.rmtree(output_dir)
     builder = Builder(toolchains, output_dir, options.git_dir,
             options.threads, options.jobs, gnu_make=gnu_make, checkout=True,
-            show_unknown=options.show_unknown, step=options.step)
+            show_unknown=options.show_unknown, step=options.step,
+            no_subdirs=options.no_subdirs)
     builder.force_config_on_failure = not options.quick
     if make_func:
         builder.do_make = make_func