From f4aaee01faea1998b2403ffe951fe6100fb4e587 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 21 Oct 2019 16:26:07 +0200 Subject: Revert "build: separate signing logic" This reverts commit 4a45e69d190f72ed94878487b271ed7651dd9efa. This broke the buildbots Signed-off-by: John Crispin --- include/image-commands.mk | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/image-commands.mk b/include/image-commands.mk index 3d10b18bc8..5dfd6a2c2f 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -373,14 +373,11 @@ metadata_json = \ define Build/append-metadata $(if $(SUPPORTED_DEVICES),-echo $(call metadata_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@) - [ -z "$(SIGNED_IMAGES)" \ - -o ! -s "$(BUILD_KEY)" \ - -o ! -s "$(BUILD_KEY).ucert" \ - -o ! -s "$@" ] || { \ - cp "$(BUILD_KEY).ucert" "$@.ucert" ;\ - usign -S -m "$@" -s "$(BUILD_KEY)" -x "$@.sig" ;\ - ucert -A -c "$@.ucert" -x "$@.sig" ;\ - fwtool -S "$@.ucert" "$@" ;\ + [ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" -o ! -s "$@" ] || { \ + cp "$(BUILD_KEY).ucert" "$@.ucert" ;\ + usign -S -m "$@" -s "$(BUILD_KEY)" -x "$@.sig" ;\ + ucert -A -c "$@.ucert" -x "$@.sig" ;\ + fwtool -S "$@.ucert" "$@" ;\ } endef -- cgit v1.2.3