From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 7 Aug 2018 22:47:12 +0000 (+0200)
Subject: image: fix build without ucert
X-Git-Tag: v19.07.0-rc1~2872
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec78f03de589adc9bd47a02d723d7054510601dd;p=openwrt%2Fstaging%2Fhauke.git

image: fix build without ucert

Make sure the Shell-expression returns true also in case of
key-build.ucert being absent.

Fixes commit 848b455d2e ("image: use ucert to append signature")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 01040138a4..f7e6ba6aa6 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -309,7 +309,7 @@ metadata_json = \
 
 define Build/append-metadata
 	$(if $(SUPPORTED_DEVICES),-echo $(call metadata_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@)
-	[ -s "$(BUILD_KEY)" -a -s "$(BUILD_KEY).ucert" ] && { \
+	[ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" ] || { \
 		cp "$(BUILD_KEY).ucert" "$@.ucert" ;\
 		usign -S -m "$@" -s "$(BUILD_KEY)" -x "$@.sig" ;\
 		ucert -A -c "$@.ucert" -x "$@.sig" ;\