diff mbox

[U-Boot,v3,09/18] buildman: Set up bsettings outside the control module

Message ID 1409965223-29863-10-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Sept. 6, 2014, 1 a.m. UTC 
Move the bsettings code back to the main buildman.py file, so we can do
something different when testing.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v3: None
Changes in v2: None

 tools/buildman/buildman.py | 2 ++
 tools/buildman/control.py  | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Simon Glass Sept. 10, 2014, 6:50 p.m. UTC | #1 
Applied to u-boot-x86/buildman.
diff mbox

Patch

diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py
index 6771c86..d0afeda 100755
--- a/tools/buildman/buildman.py
+++ b/tools/buildman/buildman.py
@@ -19,6 +19,7 @@  sys.path.append(os.path.join(our_path, '../patman'))
 
 # Our modules
 import board
+import bsettings
 import builder
 import checkpatch
 import cmdline
@@ -59,5 +60,6 @@  if options.test:
 
 # Build selected commits for selected boards
 else:
+    bsettings.Setup(options.config_file)
     ret_code = control.DoBuildman(options, args)
     sys.exit(ret_code)
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 213e235..c8eeb6a 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -101,7 +101,6 @@  def DoBuildman(options, args, toolchains=None, make_func=None):
 
     gitutil.Setup()
 
-    bsettings.Setup(options.config_file)
     options.git_dir = os.path.join(options.git, '.git')
 
     if not toolchains: