From 22d012ff509f0c619b8e196bcbaa72a3247d1c4d Mon Sep 17 00:00:00 2001
From: Francisco Molina <femolina@uc.cl>
Date: Mon, 16 Aug 2021 11:23:50 +0200
Subject: [PATCH] makefiles/suit*: use $(Q) to silence output

---
 .../suit_tool/create.py                       |  1 -
 makefiles/suit.base.inc.mk                    | 10 +++++-----
 makefiles/suit.inc.mk                         | 20 +++++++++----------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dist/tools/suit/suit-manifest-generator/suit_tool/create.py b/dist/tools/suit/suit-manifest-generator/suit_tool/create.py
index 5201da628e..17e9388275 100644
--- a/dist/tools/suit/suit-manifest-generator/suit_tool/create.py
+++ b/dist/tools/suit/suit-manifest-generator/suit_tool/create.py
@@ -27,7 +27,6 @@ def main(options):
     m = json.loads(options.input_file.read(), object_pairs_hook=OrderedDict)
 
     nm = compile_manifest(options, m)
-    print('create done. Serializing')
     if m.get('severable') or (hasattr(options, 'severable') and options.severable):
         nm = nm.to_severable('sha256')
     output = {
diff --git a/makefiles/suit.base.inc.mk b/makefiles/suit.base.inc.mk
index 9e1df547ac..e8cb8ee3d9 100644
--- a/makefiles/suit.base.inc.mk
+++ b/makefiles/suit.base.inc.mk
@@ -25,16 +25,16 @@ CFLAGS += -I$(SUIT_PUB_HDR_DIR)
 BUILDDEPS += $(SUIT_PUB_HDR)
 
 $(SUIT_SEC): $(CLEAN)
-	@echo suit: generating key in $(SUIT_KEY_DIR)
-	@mkdir -p $(SUIT_KEY_DIR)
-	@$(RIOTBASE)/dist/tools/suit/gen_key.py $(SUIT_SEC)
+	$(Q)echo suit: generating key in $(SUIT_KEY_DIR)
+	$(Q)mkdir -p $(SUIT_KEY_DIR)
+	$(Q)$(RIOTBASE)/dist/tools/suit/gen_key.py $(SUIT_SEC)
 
 # set FORCE so switching between keys using "SUIT_KEY=foo make ..."
 # triggers a rebuild even if the new key would otherwise not (because the other
 # key's mtime is too far back).
 $(SUIT_PUB_HDR): $(SUIT_SEC) FORCE | $(CLEAN)
-	@mkdir -p $(SUIT_PUB_HDR_DIR)
-	@$(SUIT_TOOL) pubkey -f header -k $(SUIT_SEC) \
+	$(Q)mkdir -p $(SUIT_PUB_HDR_DIR)
+	$(Q)$(SUIT_TOOL) pubkey -f header -k $(SUIT_SEC) \
 	  | '$(LAZYSPONGE)' $(LAZYSPONGE_FLAGS) '$@'
 
 suit/genkey: $(SUIT_SEC)
diff --git a/makefiles/suit.inc.mk b/makefiles/suit.inc.mk
index 631ce9c04d..2f4a141e65 100644
--- a/makefiles/suit.inc.mk
+++ b/makefiles/suit.inc.mk
@@ -27,7 +27,7 @@ SUIT_CLASS ?= $(BOARD)
 
 #
 $(SUIT_MANIFEST): $(SLOT0_RIOT_BIN) $(SLOT1_RIOT_BIN)
-	$(RIOTBASE)/dist/tools/suit/gen_manifest.py \
+	$(Q)$(RIOTBASE)/dist/tools/suit/gen_manifest.py \
 	  --urlroot $(SUIT_COAP_ROOT) \
 	  --seqnr $(SUIT_SEQNR) \
 	  --uuid-vendor $(SUIT_VENDOR) \
@@ -36,19 +36,19 @@ $(SUIT_MANIFEST): $(SLOT0_RIOT_BIN) $(SLOT1_RIOT_BIN)
 	  $(SLOT0_RIOT_BIN):$(SLOT0_OFFSET) \
 	  $(SLOT1_RIOT_BIN):$(SLOT1_OFFSET)
 
-	$(SUIT_TOOL) create -f suit -i $@.tmp -o $@
+	$(Q)$(SUIT_TOOL) create -f suit -i $@.tmp -o $@
 
-	rm -f $@.tmp
+	$(Q)rm -f $@.tmp
 
 
 $(SUIT_MANIFEST_SIGNED): $(SUIT_MANIFEST) $(SUIT_SEC)
-	$(SUIT_TOOL) sign -k $(SUIT_SEC) -m $(SUIT_MANIFEST) -o $@
+	$(Q)$(SUIT_TOOL) sign -k $(SUIT_SEC) -m $(SUIT_MANIFEST) -o $@
 
 $(SUIT_MANIFEST_LATEST): $(SUIT_MANIFEST)
-	@ln -f -s $< $@
+	$(Q)ln -f -s $< $@
 
 $(SUIT_MANIFEST_SIGNED_LATEST): $(SUIT_MANIFEST_SIGNED)
-	@ln -f -s $< $@
+	$(Q)ln -f -s $< $@
 
 SUIT_MANIFESTS := $(SUIT_MANIFEST) \
                   $(SUIT_MANIFEST_LATEST) \
@@ -58,15 +58,15 @@ SUIT_MANIFESTS := $(SUIT_MANIFEST) \
 suit/manifest: $(SUIT_MANIFESTS)
 
 suit/publish: $(SUIT_MANIFESTS) $(SLOT0_RIOT_BIN) $(SLOT1_RIOT_BIN)
-	@mkdir -p $(SUIT_COAP_FSROOT)/$(SUIT_COAP_BASEPATH)
-	@cp $^ $(SUIT_COAP_FSROOT)/$(SUIT_COAP_BASEPATH)
-	@for file in $^; do \
+	$(Q)mkdir -p $(SUIT_COAP_FSROOT)/$(SUIT_COAP_BASEPATH)
+	$(Q)cp $^ $(SUIT_COAP_FSROOT)/$(SUIT_COAP_BASEPATH)
+	$(Q)for file in $^; do \
 		echo "published \"$$file\""; \
 		echo "       as \"$(SUIT_COAP_ROOT)/$$(basename $$file)\""; \
 	done
 
 suit/notify: | $(filter suit/publish, $(MAKECMDGOALS))
-	@test -n "$(SUIT_CLIENT)" || { echo "error: SUIT_CLIENT unset!"; false; }
+	$(Q)test -n "$(SUIT_CLIENT)" || { echo "error: SUIT_CLIENT unset!"; false; }
 	aiocoap-client -m POST "coap://$(SUIT_CLIENT)/suit/trigger" \
 		--payload "$(SUIT_COAP_ROOT)/$(SUIT_NOTIFY_MANIFEST)" && \
 		echo "Triggered $(SUIT_CLIENT) to update."