diff options
| author | Simon Glass | 2020-07-19 09:59:49 -0600 |
|---|---|---|
| committer | Simon Glass | 2020-07-28 19:30:39 -0600 |
| commit | 5a910b92bc9d63d855f3efa8d10cb25db0a8ac60 (patch) | |
| tree | 3329126e02a04532dc6b44d0ab454a0808d636f4 /tools | |
| parent | 56c31e5e500dbc4371359d15be5990c9f288ca58 (diff) | |
buildman: Allow using older versions of genboardscfg.py
Older versions of this script don't support the -q flag. Since buildman
runs this script from when it starts, we may get the old version.
Fix this in two ways:
1. Use the version from the same tree as buildman is run from, if
available
2. Failing that, allow the -q flag to be missing
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildman/control.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 071c2613ecf..b81ecf6a539 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -185,10 +185,16 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, if not os.path.exists(options.output_dir): os.makedirs(options.output_dir) board_file = os.path.join(options.output_dir, 'boards.cfg') - genboardscfg = os.path.join(options.git, 'tools/genboardscfg.py') + our_path = os.path.dirname(os.path.realpath(__file__)) + genboardscfg = os.path.join(our_path, '../genboardscfg.py') + if not os.path.exists(genboardscfg): + genboardscfg = os.path.join(options.git, 'tools/genboardscfg.py') status = subprocess.call([genboardscfg, '-q', '-o', board_file]) if status != 0: - sys.exit("Failed to generate boards.cfg") + # Older versions don't support -q + status = subprocess.call([genboardscfg, '-o', board_file]) + if status != 0: + sys.exit("Failed to generate boards.cfg") boards = board.Boards() boards.ReadBoards(board_file) |