riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

makefiles/suit*: use $(Q) to silence output

Browse Source
This commit is contained in:
Francisco Molina 2021-08-16 11:23:50 +02:00
parent b062ce8660
commit 22d012ff50
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dist/tools/suit/suit-manifest-generator/suit_tool/create.py vendored
View File

@ -27,7 +27,6 @@ def main(options):
m = json.loads(options.input_file.read(), object_pairs_hook=OrderedDict) m = json.loads(options.input_file.read(), object_pairs_hook=OrderedDict)
nm = compile_manifest(options, m) nm = compile_manifest(options, m)
print('create done. Serializing')
if m.get('severable') or (hasattr(options, 'severable') and options.severable): if m.get('severable') or (hasattr(options, 'severable') and options.severable):
nm = nm.to_severable('sha256') nm = nm.to_severable('sha256')
output = { output = {

10
makefiles/suit.base.inc.mk
View File

@ -25,16 +25,16 @@ CFLAGS += -I$(SUIT_PUB_HDR_DIR)
BUILDDEPS += $(SUIT_PUB_HDR) BUILDDEPS += $(SUIT_PUB_HDR)
$(SUIT_SEC): $(CLEAN) $(SUIT_SEC): $(CLEAN)
@echo suit: generating key in $(SUIT_KEY_DIR) $(Q)echo suit: generating key in $(SUIT_KEY_DIR)
@mkdir -p $(SUIT_KEY_DIR) $(Q)mkdir -p $(SUIT_KEY_DIR)
@$(RIOTBASE)/dist/tools/suit/gen_key.py $(SUIT_SEC) $(Q)$(RIOTBASE)/dist/tools/suit/gen_key.py $(SUIT_SEC)
# set FORCE so switching between keys using "SUIT_KEY=foo make ..." # 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 # triggers a rebuild even if the new key would otherwise not (because the other
# key's mtime is too far back). # key's mtime is too far back).
$(SUIT_PUB_HDR): $(SUIT_SEC) FORCE | $(CLEAN) $(SUIT_PUB_HDR): $(SUIT_SEC) FORCE | $(CLEAN)
@mkdir -p $(SUIT_PUB_HDR_DIR) $(Q)mkdir -p $(SUIT_PUB_HDR_DIR)
@$(SUIT_TOOL) pubkey -f header -k $(SUIT_SEC) \ $(Q)$(SUIT_TOOL) pubkey -f header -k $(SUIT_SEC) \
| '$(LAZYSPONGE)' $(LAZYSPONGE_FLAGS) '$@' | '$(LAZYSPONGE)' $(LAZYSPONGE_FLAGS) '$@'
suit/genkey: $(SUIT_SEC) suit/genkey: $(SUIT_SEC)

20
makefiles/suit.inc.mk
View File

@ -27,7 +27,7 @@ SUIT_CLASS ?= $(BOARD)
# #
$(SUIT_MANIFEST): $(SLOT0_RIOT_BIN) $(SLOT1_RIOT_BIN) $(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) \ --urlroot $(SUIT_COAP_ROOT) \
--seqnr $(SUIT_SEQNR) \ --seqnr $(SUIT_SEQNR) \
--uuid-vendor $(SUIT_VENDOR) \ --uuid-vendor $(SUIT_VENDOR) \
@ -36,19 +36,19 @@ $(SUIT_MANIFEST): $(SLOT0_RIOT_BIN) $(SLOT1_RIOT_BIN)
$(SLOT0_RIOT_BIN):$(SLOT0_OFFSET) \ $(SLOT0_RIOT_BIN):$(SLOT0_OFFSET) \
$(SLOT1_RIOT_BIN):$(SLOT1_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_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) $(SUIT_MANIFEST_LATEST): $(SUIT_MANIFEST)
@ln -f -s $< $@ $(Q)ln -f -s $< $@
$(SUIT_MANIFEST_SIGNED_LATEST): $(SUIT_MANIFEST_SIGNED) $(SUIT_MANIFEST_SIGNED_LATEST): $(SUIT_MANIFEST_SIGNED)
@ln -f -s $< $@ $(Q)ln -f -s $< $@
SUIT_MANIFESTS := $(SUIT_MANIFEST) \ SUIT_MANIFESTS := $(SUIT_MANIFEST) \
$(SUIT_MANIFEST_LATEST) \ $(SUIT_MANIFEST_LATEST) \
@ -58,15 +58,15 @@ SUIT_MANIFESTS := $(SUIT_MANIFEST) \
suit/manifest: $(SUIT_MANIFESTS) suit/manifest: $(SUIT_MANIFESTS)
suit/publish: $(SUIT_MANIFESTS) $(SLOT0_RIOT_BIN) $(SLOT1_RIOT_BIN) suit/publish: $(SUIT_MANIFESTS) $(SLOT0_RIOT_BIN) $(SLOT1_RIOT_BIN)
@mkdir -p $(SUIT_COAP_FSROOT)/$(SUIT_COAP_BASEPATH) $(Q)mkdir -p $(SUIT_COAP_FSROOT)/$(SUIT_COAP_BASEPATH)
@cp $^ $(SUIT_COAP_FSROOT)/$(SUIT_COAP_BASEPATH) $(Q)cp $^ $(SUIT_COAP_FSROOT)/$(SUIT_COAP_BASEPATH)
@for file in $^; do \ $(Q)for file in $^; do \
echo "published \"$$file\""; \ echo "published \"$$file\""; \
echo " as \"$(SUIT_COAP_ROOT)/$$(basename $$file)\""; \ echo " as \"$(SUIT_COAP_ROOT)/$$(basename $$file)\""; \
done done
suit/notify: | $(filter suit/publish, $(MAKECMDGOALS)) 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" \ aiocoap-client -m POST "coap://$(SUIT_CLIENT)/suit/trigger" \
--payload "$(SUIT_COAP_ROOT)/$(SUIT_NOTIFY_MANIFEST)" && \ --payload "$(SUIT_COAP_ROOT)/$(SUIT_NOTIFY_MANIFEST)" && \
echo "Triggered $(SUIT_CLIENT) to update." echo "Triggered $(SUIT_CLIENT) to update."