diff mbox

[U-Boot,v3] Makefile: remove generated boards.cfg within make distclean

Message ID 1408490030-19643-1-git-send-email-roger@bufferoverflow.ch
State Changes Requested
Delegated to: Tom Rini
Headers show

Commit Message

Roger Meier Aug. 19, 2014, 11:13 p.m. UTC
Signed-off-by: Roger Meier <roger@bufferoverflow.ch>
CC: Masahiro Yamada <yamada.m@jp.panasonic.com>
CC: Tom Rini <trini@ti.com>
CC: Wolfgang Denk <wd@denx.de>

---
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
---
 MAKEALL  |    2 +-
 Makefile |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Masahiro Yamada Aug. 20, 2014, 1:06 a.m. UTC | #1
Hi Roger,


On Wed, 20 Aug 2014 01:13:50 +0200
Roger Meier <roger@bufferoverflow.ch> wrote:

> Signed-off-by: Roger Meier <roger@bufferoverflow.ch>
> CC: Masahiro Yamada <yamada.m@jp.panasonic.com>
> CC: Tom Rini <trini@ti.com>
> CC: Wolfgang Denk <wd@denx.de>


Most people use 'Cc:' instead of 'CC:'.


$ git log v2013.01..v2014.07 | grep 'Cc:' | wc
   2007    8047   87385
$ git log v2013.01..v2014.07 | grep 'CC:' | wc
    147     598    6443




> diff --git a/Makefile b/Makefile
> index 666d291..6679408 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1285,7 +1285,8 @@ distclean: mrproper
>  		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
>  		-o -name '.*.rej' -o -name '*%' -o -name 'core' \
>  		-o -name '*.pyc' \) \
> -		-type f -print | xargs rm -f
> +		-type f -print | xargs rm -f \
> +	@rm -f boards.cfg
>  
>  backup:
>  	F=`basename $(srctree)` ; cd .. ; \


No.  You missed one of my comments against v2.

Please remove the backslash after "xargs rm -f".


Here, you are doing

@find ... | xargs rm -f @rm -f boards.cfg


that is, you are trying to delete
'@rm' as well as 'boards.cfg' if they exist.


Besides, you also need to fix buildman
as Simon suggested.


Please also cc Simon when you post the next version.




Best Regards
Masahiro Yamada
diff mbox

Patch

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 666d291..6679408 100644
--- a/Makefile
+++ b/Makefile
@@ -1285,7 +1285,8 @@  distclean: mrproper
 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
 		-o -name '.*.rej' -o -name '*%' -o -name 'core' \
 		-o -name '*.pyc' \) \
-		-type f -print | xargs rm -f
+		-type f -print | xargs rm -f \
+	@rm -f boards.cfg
 
 backup:
 	F=`basename $(srctree)` ; cd .. ; \