Merge remote-tracking branch 'github-heads/master' into pureboot-27-heads-upstream

.circleci/config.yml

@@ -24,7 +24,11 @@ commands:
       - run:
           name: Output hashes
           command: |
-            cat build/<<parameters.arch>>/<<parameters.target>>/hashes.txt || echo "No hashes for this build step..."\
+            cat build/<<parameters.arch>>/<<parameters.target>>/hashes.txt || echo "No hashes.txt for this build step..."
+      - run:
+          name: Output sizes
+          command: |
+            cat build/<<parameters.arch>>/<<parameters.target>>/sizes.txt || echo "No sizes.txt for this build step..."
       - run:
           name: Archiving build logs.
           command: |

Makefile

@@ -73,11 +73,13 @@ PACKAGES	:= $(shell mkdir -p "$(packages)")
 
 # record the build date / git hashes and other files here
 HASHES		:= $(board_build)/hashes.txt
+SIZES		:= $(board_build)/sizes.txt
 
 # Create the board output directory if it doesn't already exist
 BOARD_LOG	:= $(shell \
 	mkdir -p "$(board_build)" ; \
 	echo "$(DATE) $(GIT_HASH) $(GIT_STATUS)" > "$(HASHES)" ; \
+	echo "$(DATE) $(GIT_HASH) $(GIT_STATUS)" > "$(SIZES)" ; \
 )
 
 ifeq "y" "$(CONFIG_LINUX_BUNDLED)"
@@ -170,6 +172,7 @@ endif
 
 all payload:
 	@sha256sum $< | tee -a "$(HASHES)"
+	@stat -c "%8s:%n" $< | tee -a "$(SIZES)"
 
 # Disable all built in rules
 .INTERMEDIATE:
@@ -234,6 +237,7 @@ define do-cpio =
 		rm "$1.tmp" ; \
 	fi
 	@sha256sum "$1" | tee -a "$(HASHES)"
+	@stat -c "%8s:%n" "$1" | tee -a "$(SIZES)"
 	$(call do,HASHES   , $1,\
 		( cd "$2"; \
 		echo "-----" ; \
@@ -242,6 +246,14 @@ define do-cpio =
 		echo "-----" ; \
 		) >> "$(HASHES)" \
 	)
+	$(call do,SIZES    , $1,\
+		( cd "$2"; \
+		echo "-----" ; \
+		find . -type f -print0 \
+		| xargs -0 stat -c "%8s:%n" ; \
+		echo "-----" ; \
+		) >> "$(SIZES)" \
+	)
 endef
 
 define do-copy =
@@ -252,6 +264,7 @@ define do-copy =
 		cp -a --remove-destination "$1" "$2" ; \
 	)
 	@sha256sum "$(2:$(pwd)/%=%)"
+	@stat -c "%8s:%n" "$(2:$(pwd)/%=%)"
 endef
 
 
@@ -583,6 +596,7 @@ $(build)/$(initrd_dir)/initrd.cpio.xz: $(initrd-y)
 		rm "$@.tmp" ; \
 	fi
 	@sha256sum "$(@:$(pwd)/%=%)" | tee -a "$(HASHES)"
+	@stat -c "%8s:%n" "$(@:$(pwd)/%=%)" | tee -a "$(SIZES)"
 
 #
 # At the moment PowerPC can only load initrd bundled with the kernel.

modules/linux

@@ -198,6 +198,7 @@ $(build)/$(BOARD)/$(LINUX_IMAGE_FILE): $(build)/$(linux_dir)/.build
 	$(call do-copy,$(dir $<)/$(linux_output),$@)
 	@touch $@ # force a timestamp update
 	@sha256sum "$@" | tee -a "$(HASHES)"
+	@stat -c "%8s:%n" "$@" | tee -a "$(SIZES)"
 
 # Build kernel second time, now that initrd is built.
 $(build)/$(BOARD)/$(LINUX_IMAGE_FILE).bundled: \