From fd03d63f347e28e4e4394245210f048c82c9b085 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Fri, 5 Sep 2014 19:00:14 -0600
Subject: [PATCH] buildman: Set up bsettings outside the control module
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>
---
tools/buildman/buildman.py | 2 ++
tools/buildman/control.py | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py
index 6771c862d3..d0afeda6c0 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 213e235a11..c8eeb6ac45 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:
--
2.39.5