From fd18a89e7f998133000ccb149366ba76f75e7ba5 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Wed, 20 Aug 2014 22:10:29 +0200 Subject: Makefile: remove generated boards.cfg within make distclean Signed-off-by: Roger Meier Reviewed-by: Masahiro Yamada Tested-by: Masahiro Yamada Cc: Tom Rini Cc: Wolfgang Denk Cc: Simon Glass --- tools/buildman/builder.py | 2 +- tools/buildman/builderthread.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index d5b8454c08..a555bd81fc 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 32297e20e8..8214662e36 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 -- cgit v1.2.1