Compare commits
5 Commits
patc
...
add-vision
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7381ec48b8 | ||
|
|
fa3b6c235d | ||
|
|
f3982a9c12 | ||
|
|
8292f801e9 | ||
|
|
8c5793fdd6 |
@@ -691,3 +691,8 @@ nyan-big:
|
|||||||
variables:
|
variables:
|
||||||
ROLE: nyan-big
|
ROLE: nyan-big
|
||||||
<<: *lab_dfn
|
<<: *lab_dfn
|
||||||
|
|
||||||
|
vision5:
|
||||||
|
variables:
|
||||||
|
ROLE: vision5
|
||||||
|
<<: *lab_dfn
|
||||||
|
|||||||
@@ -158,10 +158,15 @@ def get_details(config):
|
|||||||
env['U_BOOT_BUILD_DIR'] = build_dir
|
env['U_BOOT_BUILD_DIR'] = build_dir
|
||||||
if build_dir_extra:
|
if build_dir_extra:
|
||||||
env['U_BOOT_BUILD_DIR_EXTRA'] = build_dir_extra
|
env['U_BOOT_BUILD_DIR_EXTRA'] = build_dir_extra
|
||||||
proc = subprocess.run(cmd, capture_output=True, encoding='utf-8',
|
|
||||||
|
# Make sure the script sees that it is being run from pytest
|
||||||
|
env['U_BOOT_SOURCE_DIR'] = source_dir
|
||||||
|
|
||||||
|
proc = subprocess.run(cmd, stdout=subprocess.PIPE,
|
||||||
|
stderr=subprocess.STDOUT, encoding='utf-8',
|
||||||
env=env)
|
env=env)
|
||||||
if proc.returncode:
|
if proc.returncode:
|
||||||
raise ValueError(proc.stderr)
|
raise ValueError(f"Error {proc.returncode} running {cmd}: '{proc.stderr} '{proc.stdout}'")
|
||||||
# For debugging
|
# For debugging
|
||||||
# print('conftest: lab:', proc.stdout)
|
# print('conftest: lab:', proc.stdout)
|
||||||
vals = {}
|
vals = {}
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ from u_boot_pylib import tools
|
|||||||
from u_boot_pylib import tout
|
from u_boot_pylib import tout
|
||||||
|
|
||||||
### constant variables ###
|
### constant variables ###
|
||||||
OUTPUT_FILE = 'boards.cfg'
|
|
||||||
CONFIG_DIR = 'configs'
|
CONFIG_DIR = 'configs'
|
||||||
SLEEP_TIME = 0.03
|
SLEEP_TIME = 0.03
|
||||||
COMMENT_BLOCK = f'''#
|
COMMENT_BLOCK = f'''#
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import threading
|
|||||||
from buildman import cfgutil
|
from buildman import cfgutil
|
||||||
from patman import gitutil
|
from patman import gitutil
|
||||||
from u_boot_pylib import command
|
from u_boot_pylib import command
|
||||||
|
from u_boot_pylib import tools
|
||||||
|
|
||||||
RETURN_CODE_RETRY = -1
|
RETURN_CODE_RETRY = -1
|
||||||
BASE_ELF_FILENAMES = ['u-boot', 'spl/u-boot-spl', 'tpl/u-boot-tpl']
|
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:
|
if result.return_code < 0:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
done_file = self.builder.get_done_file(result.commit_upto,
|
||||||
|
result.brd.target)
|
||||||
if result.toolchain:
|
if result.toolchain:
|
||||||
# Write the build result and toolchain information.
|
# 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:
|
with open(done_file, 'w', encoding='utf-8') as outf:
|
||||||
if maybe_aborted:
|
if maybe_aborted:
|
||||||
# Special code to indicate we need to retry
|
# Special code to indicate we need to retry
|
||||||
@@ -638,6 +639,9 @@ class BuilderThread(threading.Thread):
|
|||||||
result.brd.target)
|
result.brd.target)
|
||||||
with open(sizes, 'w', encoding='utf-8') as outf:
|
with open(sizes, 'w', encoding='utf-8') as outf:
|
||||||
print('\n'.join(lines), file=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:
|
if not work_in_output:
|
||||||
# Write out the configuration files, with a special case for SPL
|
# Write out the configuration files, with a special case for SPL
|
||||||
|
|||||||
Reference in New Issue
Block a user