From: Simon Glass <sjg@chromium.org>
Date: Tue, 2 Dec 2014 00:33:52 +0000 (-0700)
Subject: buildman: Put build in 'current', not 'current/current'
X-Git-Tag: v2015.04-rc1~85^2~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=05c96b187ac5a4c81238754555c86dc7c4fba20b;p=oweals%2Fu-boot.git

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>
---

diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index fb79a1ecfe..48797e90a7 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,