diff options
| author | Simon Glass <sjg@chromium.org> | 2014-08-09 15:33:05 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-08-13 08:34:15 -0600 |
| commit | 0f7c9ddaed23851d39d781714e80097c97a4d55d (patch) | |
| tree | 3f9747eb7b3fe3d911662621ca96c47a5f3d9d3f /tools | |
| parent | d3269ed380c50eeb5230de8ba1fd62fbe3cc263d (diff) | |
| download | blackbird-obmc-uboot-0f7c9ddaed23851d39d781714e80097c97a4d55d.tar.gz blackbird-obmc-uboot-0f7c9ddaed23851d39d781714e80097c97a4d55d.zip | |
buildman: Add an option to specify the buildman config file
Add a new --config-file option (-G) to specify a different configuration
file from the default ~/.buildman.
Reported-by: Tom Rini <trini@ti.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildman/buildman.py | 2 | ||||
| -rw-r--r-- | tools/buildman/control.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py index f32557fee7..6ca8dc65b5 100755 --- a/tools/buildman/buildman.py +++ b/tools/buildman/buildman.py @@ -83,6 +83,8 @@ parser.add_option('-F', '--force-build-failures', dest='force_build_failures', help='Force build of previously-failed build') parser.add_option('-g', '--git', type='string', help='Git repo containing branch to build', default='.') +parser.add_option('-G', '--config-file', type='string', + help='Path to buildman config file', default='') parser.add_option('-H', '--full-help', action='store_true', dest='full_help', default=False, help='Display the README file') parser.add_option('-i', '--in-tree', dest='in_tree', diff --git a/tools/buildman/control.py b/tools/buildman/control.py index cc8593f7eb..0c9e2cbfee 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -86,7 +86,7 @@ def DoBuildman(options, args): """ gitutil.Setup() - bsettings.Setup() + bsettings.Setup(options.config_file) options.git_dir = os.path.join(options.git, '.git') toolchains = toolchain.Toolchains() |
