summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-12-01 17:33:52 -0700
committerSimon Glass <sjg@chromium.org>2015-01-14 21:16:52 -0800
commit05c96b187ac5a4c81238754555c86dc7c4fba20b (patch)
treee4a720ac2683db06cf49f8da7e2d12a43995c371 /tools
parent4466c1f943efa974d8e4671778d44427cc535be3 (diff)
buildman: Put build in 'current', not 'current/current'
Buildman currently puts current-source builds in a current/current subdirectory, but there is no need for the extra depth. Suggested-by: Albert Aribaud <albert.u.boot@aribaud.net> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/buildman/control.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index fb79a1ecfef..48797e90a74 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -207,12 +207,11 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
if not gnu_make:
sys.exit('GNU Make not found')
- # Create a new builder with the selected options
+ # Create a new builder with the selected options.
+ output_dir = options.output_dir
if options.branch:
dirname = options.branch.replace('/', '_')
- else:
- dirname = 'current'
- output_dir = os.path.join(options.output_dir, dirname)
+ 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,