Revert "build: separate signing logic"

[openwrt/staging/mkresin.git] / include / image-commands.mk

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 3d10b18bc82fc8b7faecd527c86ef988100db52c..5dfd6a2c2fd464821081b7ffc1070b9f8ada7ca8 100644 (file)
--- 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