aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2018-09-17 23:55:42 -0600
committerSimon Glass <sjg@chromium.org>2018-09-29 11:49:35 -0600
commite62a24ce27ab86efc1b37d14112c29d3f2010238 (patch)
tree98b8bb8426234c678cc14afc4a18080121b9ce4a
parent3eb992a481157a954e7c436faa7eeae757767621 (diff)
downloadu-boot-e62a24ce27ab86efc1b37d14112c29d3f2010238.zip
u-boot-e62a24ce27ab86efc1b37d14112c29d3f2010238.tar.gz
u-boot-e62a24ce27ab86efc1b37d14112c29d3f2010238.tar.bz2
buildman: Avoid hanging when the config changes
Something has changed in the last several month such that when buildman builds U-Boot incrementally and a new CONFIG option has been added to the Kconfig, the build hanges waiting for input: Test new config (NEW_CONFIG) [N/y/?] (NEW) Since binamn does not connect the build's stdin to anything this waits on stdin to the build thread, which never comes. Eventually I suspect all the threads end up in this state and the build does not progress. Fix this by passing /dev/null as input to the build. That way, if there is a new CONFIG, the build will stop (and fail): Test new config (NEW_CONFIG) [N/y/?] (NEW) Error in reading or end of file. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--tools/buildman/builder.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index a5a2ffd..05f8299 100644
--- a/tools/buildman/builder.py
+++ b/tools/buildman/builder.py
@@ -408,7 +408,7 @@ class Builder:
"""
cmd = [self.gnu_make] + list(args)
result = command.RunPipe([cmd], capture=True, capture_stderr=True,
- cwd=cwd, raise_on_error=False, **kwargs)
+ cwd=cwd, raise_on_error=False, infile='/dev/null', **kwargs)
if self.verbose_build:
result.stdout = '%s\n' % (' '.join(cmd)) + result.stdout
result.combined = '%s\n' % (' '.join(cmd)) + result.combined