diff options
| author | Tom Rini <trini@konsulko.com> | 2025-01-25 16:27:30 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-01-25 16:28:27 -0600 |
| commit | 292278d6828e6c8c6ae11bc8658586d1acc411d4 (patch) | |
| tree | 89849177b7422c6ae8152c3a11ac9eee2ec9afd0 /tools/buildman/builderthread.py | |
| parent | 0e198ff1a9114763af3e82e7abf884ee1da4e64f (diff) | |
| parent | 1135dc50a3e1192ee6b68e788e716c6548dc7a50 (diff) | |
Merge patch series "gitlab: Fixes to get StarFive VisionFive2 into the sjg lab"
Simon Glass <sjg@chromium.org> says:
This board fought valiantly against attempts to add it to my lab. After
several hours of debugging, I found problems in the Labgrid integration
(not included here), test.py and buildman
This series fixes these and the board now seems to be reliable enough.
Note that the board fails test_dm_compat
Link: https://github.com/labgrid-project/labgrid/pull/1411
Link: https://lore.kernel.org/r/20241214182024.1954974-1-sjg@chromium.org
Diffstat (limited to 'tools/buildman/builderthread.py')
| -rw-r--r-- | tools/buildman/builderthread.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index b5afee61aff..29e6cf32af1 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -19,6 +19,7 @@ import threading from buildman import cfgutil from patman import gitutil from u_boot_pylib import command +from u_boot_pylib import tools RETURN_CODE_RETRY = -1 BASE_ELF_FILENAMES = ['u-boot', 'spl/u-boot-spl', 'tpl/u-boot-tpl'] @@ -555,10 +556,10 @@ class BuilderThread(threading.Thread): if result.return_code < 0: return + done_file = self.builder.get_done_file(result.commit_upto, + result.brd.target) if result.toolchain: # Write the build result and toolchain information. - done_file = self.builder.get_done_file(result.commit_upto, - result.brd.target) with open(done_file, 'w', encoding='utf-8') as outf: if maybe_aborted: # Special code to indicate we need to retry @@ -638,6 +639,9 @@ class BuilderThread(threading.Thread): result.brd.target) with open(sizes, 'w', encoding='utf-8') as outf: print('\n'.join(lines), file=outf) + else: + # Indicate that the build failure due to lack of toolchain + tools.write_file(done_file, '2\n', binary=False) if not work_in_output: # Write out the configuration files, with a special case for SPL |