[U-Boot] [PATCH v4] Makefile: remove generated boards.cfg within make distclean

Roger Meier roger at bufferoverflow.ch
Wed Aug 20 22:10:29 CEST 2014


Signed-off-by: Roger Meier <roger at bufferoverflow.ch>
Cc: Masahiro Yamada <yamada.m at jp.panasonic.com>
Cc: Tom Rini <trini at ti.com>
Cc: Wolfgang Denk <wd at denx.de>
Cc: Simon Glass <sjg at chromium.org>

---
Changes for v2:
   - remove boards.cfg within make distclean instead of mrproper
   - use mrproper instead of distclean within MAKEALL
Changes for v3:
   - use @rm instead of rm as suggested by Masahiro Yamada
Changes for v4:
   - remove the backslash after "xargs rm -f"
   - use mrproper instead of distclean within buildman
---
 MAKEALL                         |    2 +-
 Makefile                        |    1 +
 tools/buildman/builder.py       |    2 +-
 tools/buildman/builderthread.py |    6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index 929fe88..392ea8d 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -658,7 +658,7 @@ build_target() {
 		MAKE="${MAKE} O=${output_dir}"
 	fi
 
-	${MAKE} distclean >/dev/null
+	${MAKE} mrproper >/dev/null
 
 	echo "Building ${target} board..."
 	${MAKE} -s ${target}_defconfig >/dev/null
diff --git a/Makefile b/Makefile
index b5d5e01..c3d7afd 100644
--- a/Makefile
+++ b/Makefile
@@ -1287,6 +1287,7 @@ distclean: mrproper
 		-o -name '.*.rej' -o -name '*%' -o -name 'core' \
 		-o -name '*.pyc' \) \
 		-type f -print | xargs rm -f
+	@rm -f boards.cfg
 
 backup:
 	F=`basename $(srctree)` ; cd .. ; \
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index d5b8454..a555bd8 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 32297e2..8214662 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
-- 
1.7.10.4



More information about the U-Boot mailing list