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 ---
Changes in v5: None Changes in v4: - Add new patch to allow the config file to be specified
Changes in v3: None Changes in v2: None
tools/buildman/buildman.py | 2 ++ tools/buildman/control.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py index f32557f..6ca8dc6 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 cc8593f..0c9e2cb 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()