From 66b51d3296569d55b174a7c7f4431f01d52321f7 Mon Sep 17 00:00:00 2001 From: Trammell hudson Date: Tue, 18 Sep 2018 13:07:40 -0400 Subject: [PATCH] quiet hashing process slightly --- Makefile | 12 +++++++----- modules/linux | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ee1aa9f7..7ea55f22 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ $(error "$(BOARD): neither CONFIG_COREBOOT nor CONFIG_LINUXBOOT is set?") endif all: - sha256sum $< | tee -a "$(HASHES)" + @sha256sum $< | tee -a "$(HASHES)" # Disable all built in rules .INTERMEDIATE: @@ -192,10 +192,13 @@ define do-cpio = echo "$(DATE) UNCHANGED $(1:$(pwd)/%=%)" ; \ rm "$1.tmp" ; \ fi - $(call do,HASHES, $1,\ + @sha256sum "$1" | tee -a "$(HASHES)" + $(call do,HASHES , $1,\ ( cd "$2"; \ + echo "-----" ; \ find . -type f -print0 \ - | xargs -0 sha256sum \ + | xargs -0 sha256sum ; \ + echo "-----" ; \ ) >> "$(HASHES)" \ ) endef @@ -488,14 +491,13 @@ $(build)/$(initrd_dir)/initrd.cpio.xz: $(initrd-y) -9 \ | dd bs=512 conv=sync status=none > "$@.tmp" \ ) - sha256sum "$@" | tee -a "$(HASHES)" @if ! cmp --quiet "$@.tmp" "$@" ; then \ mv "$@.tmp" "$@" ; \ - sha256sum "$(@:$(pwd)/%=%)" ; \ else \ echo "$(DATE) UNCHANGED $(@:$(pwd)/%=%)" ; \ rm "$@.tmp" ; \ fi + @sha256sum "$(@:$(pwd)/%=%)" | tee -a "$(HASHES)" # # The heads.cpio is built from the initrd directory in the diff --git a/modules/linux b/modules/linux index 40a8d4c7..f8817935 100644 --- a/modules/linux +++ b/modules/linux @@ -155,7 +155,7 @@ $(build)/$(BOARD)/modules.cpio: $(build)/$(linux_dir)/.build $(build)/$(BOARD)/bzImage: $(build)/$(linux_dir)/.build $(call do-copy,$(dir $<)/$(linux_output),$@) @touch $@ # force a timestamp update - sha256sum "$@" | tee -a "$(HASHES)" + @sha256sum "$@" | tee -a "$(HASHES)" # menuconfig target allows us to easily reconfigure this Linux kernel