diff options
author | Simon Glass <sjg@chromium.org> | 2014-12-02 00:33:55 (GMT) |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2015-01-15 05:16:52 (GMT) |
commit | 5971ab5c44cb0c32c88fcdc90a3a9b6430463c4c (patch) | |
tree | 503e0311df4db18ff0148152c4e073fc705c9635 /tools/buildman/control.py | |
parent | 2a9e2c6a0962cb04a12d833cc5c1c0920fa3b4f5 (diff) | |
download | u-boot-fsl-qoriq-5971ab5c44cb0c32c88fcdc90a3a9b6430463c4c.tar.xz |
buildman: Add an option to flatten output directory trees
When building current source for a single board, buildman puts the output
in <output_dir>/current/current/<board>. Add an option to make it use
<output_dir>/<board> instead. This removes the unnecessary directories
in that case, controlled by the --no-subdirs/-N option.
Suggested-by: Tom Rini <trini@ti.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/buildman/control.py')
-rw-r--r-- | tools/buildman/control.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py index cec02c6..747c80d 100644 --- 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 |