diff options
| author | Roger Meier <roger@bufferoverflow.ch> | 2014-08-20 22:10:29 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-22 10:41:35 -0400 |
| commit | fd18a89e7f998133000ccb149366ba76f75e7ba5 (patch) | |
| tree | 3d60dc43cf9cabc1f310efcb5e2a00db2344dd30 /tools/buildman | |
| parent | 92ac8acc01f9152947140fd012f503c382c67b75 (diff) | |
Makefile: remove generated boards.cfg within make distclean
Signed-off-by: Roger Meier <roger@bufferoverflow.ch>
Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/buildman')
| -rw-r--r-- | tools/buildman/builder.py | 2 | ||||
| -rw-r--r-- | tools/buildman/builderthread.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index d5b8454c084..a555bd81fc4 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -308,7 +308,7 @@ class Builder: Args: commit: Commit object that is being built brd: Board object that is being built - stage: Stage that we are at (distclean, config, build) + stage: Stage that we are at (mrproper, config, build) cwd: Directory where make should be run args: Arguments to pass to make kwargs: Arguments to pass to command.RunPipe() diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index 32297e20e8f..8214662e368 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -91,7 +91,7 @@ class BuilderThread(threading.Thread): commit: Commit object that is being built brd: Board object that is being built stage: Stage of the build. Valid stages are: - distclean - can be called to clean source + mrproper - can be called to clean source config - called to configure for a board build - the main make invocation - it does the build args: A list of arguments to pass to 'make' @@ -200,8 +200,8 @@ class BuilderThread(threading.Thread): # If we need to reconfigure, do that now if do_config: - result = self.Make(commit, brd, 'distclean', cwd, - 'distclean', *args, env=env) + result = self.Make(commit, brd, 'mrproper', cwd, + 'mrproper', *args, env=env) result = self.Make(commit, brd, 'config', cwd, *(args + config_args), env=env) config_out = result.combined |