From 4a23860d0c79748f44295710978f0db79df2c82e Mon Sep 17 00:00:00 2001
From: Joakim Gebart <joakim.gebart@eistec.se>
Date: Fri, 10 Jul 2015 11:56:34 +0200
Subject: [PATCH 1/5] Makefile.buildtests: Add missing COLOR_ prefixes (typo)

---
 Makefile.buildtests | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.buildtests b/Makefile.buildtests
index 7a871f2d14..92b66727ba 100644
--- a/Makefile.buildtests
+++ b/Makefile.buildtests
@@ -143,9 +143,9 @@ info-buildsizes-diff:
 					if [[ "$${DIFF}" -gt 0 ]]; then $(COLOR_ECHO) -n "${COLOR_RED}"; fi; \
 					if [[ "$${DIFF}" -lt 0 ]]; then $(COLOR_ECHO) -n "${COLOR_GREEN}"; fi; \
 				else \
-					DIFF="$${RED}ERR"; \
+					DIFF="${COLOR_RED}ERR"; \
 				fi; \
-				echo -ne "$${DIFF}\t$${RESET}"; \
+				echo -ne "$${DIFF}\t${COLOR_RESET}"; \
 			done; \
 			echo "$${BOARD}"; \
 			for I in 0 1 2 3; do echo -ne "$${OLD[I]-${COLOR_RED}ERR${COLOR_RESET}}\t"; done; echo -e "$${OLDBIN}"; \

From e737a3a076049ee529c52e8d21fde4c72be8c257 Mon Sep 17 00:00:00 2001
From: Joakim Gebart <joakim.gebart@eistec.se>
Date: Fri, 10 Jul 2015 12:45:06 +0200
Subject: [PATCH 2/5] Makefile.buildtests: Avoid parsing error message

"recipe for target xx failed" was printed to stdout when running info-buildsize for missing files
---
 Makefile.buildtests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.buildtests b/Makefile.buildtests
index 92b66727ba..e6d56b8b62 100644
--- a/Makefile.buildtests
+++ b/Makefile.buildtests
@@ -104,7 +104,7 @@ info-objsize:
 		sort -rnk$${SORTROW}
 
 info-buildsize:
-	@$(SIZE) -dB $(BINDIR)$(APPLICATION).elf
+	@$(SIZE) -dB $(BINDIR)$(APPLICATION).elf || echo ''
 
 info-buildsizes: SHELL=bash
 info-buildsizes:

From ee8a8be09e16eb2c8c25f6602e657dd5df941523 Mon Sep 17 00:00:00 2001
From: Joakim Gebart <joakim.gebart@eistec.se>
Date: Fri, 10 Jul 2015 14:08:47 +0200
Subject: [PATCH 3/5] Makefile.include: Add clean-intermediates target

---
 Makefile.include | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile.include b/Makefile.include
index 4f975c0be0..a96faf5f3a 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -237,6 +237,11 @@ clean:
 	-@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTBASE)/pkg/$$i clean ; done
 	-@rm -rf $(BINDIR)
 
+# Remove intermediates, but keep the .elf, .hex and .map etc.
+clean-intermediates:
+	-@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTBASE)/pkg/$$i clean ; done
+	-@rm -rf $(BINDIR)/*.a $(BINDIR)/*/
+
 distclean:
 	-@for i in $(USEPKG) ; do "$(MAKE)" -C $(RIOTBASE)/pkg/$$i distclean ; done
 	-@rm -rf $(BINDIRBASE)

From 26938059d604356cfb68603b3d8d7f3f8cf5611b Mon Sep 17 00:00:00 2001
From: Joakim Gebart <joakim.gebart@eistec.se>
Date: Fri, 10 Jul 2015 14:09:10 +0200
Subject: [PATCH 4/5] Makefile.buildtests: Use clean-intermediates instead of
 clean

---
 Makefile.buildtests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.buildtests b/Makefile.buildtests
index e6d56b8b62..a205de53d9 100644
--- a/Makefile.buildtests
+++ b/Makefile.buildtests
@@ -83,7 +83,7 @@ buildtest:
 			BINDIRBASE=$${BINDIRBASE} \
 			RIOTNOLINK=$${RIOTNOLINK} \
 			RIOT_VERSION=$${RIOT_VERSION} \
-			$(MAKE) clean 2>&1 >/dev/null || true; \
+			$(MAKE) clean-intermediates 2>&1 >/dev/null || true; \
 	done; \
 	$${BUILDTESTOK}
 endif # BUILD_IN_DOCKER

From df34f0a2fc72a44769431a87a9159b6a59cc3886 Mon Sep 17 00:00:00 2001
From: Joakim Gebart <joakim.gebart@eistec.se>
Date: Fri, 10 Jul 2015 16:47:08 +0200
Subject: [PATCH 5/5] Makefile.buildtests: silent run info-buildsizes

---
 Makefile.buildtests | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.buildtests b/Makefile.buildtests
index a205de53d9..3c540082cd 100644
--- a/Makefile.buildtests
+++ b/Makefile.buildtests
@@ -108,7 +108,7 @@ info-buildsize:
 
 info-buildsizes: SHELL=bash
 info-buildsizes:
-	echo -e "   text\t   data\t    bss\t    dec\tboard"; \
+	@echo -e "   text\t   data\t    bss\t    dec\tboard"; \
 	for BOARD in $$($(MAKE) -s info-boards-supported); do \
 		echo "$$(env -i \
 			HOME=$${HOME} \
@@ -123,7 +123,7 @@ info-buildsizes:
 
 info-buildsizes-diff: SHELL=bash
 info-buildsizes-diff:
-	echo -e "text\tdata\tbss\tdec\tBOARD/BINDIRBASE\n"; \
+	@echo -e "text\tdata\tbss\tdec\tBOARD/BINDIRBASE\n"; \
 	for BOARD in $$($(MAKE) -s info-boards-supported); do \
 		for BINDIRBASE in $${OLDBIN} $${NEWBIN}; do \
 			env -i \