From a384490b102c72b262b716ec746e75dc27f89727 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 19 May 2023 09:31:36 +0100 Subject: [PATCH] mediatek: fix append-gl-metadata when running in buildbot Use same logic as in append-metadata so build doesn't fail in case of missing build-key (it was previously failing on the buildbot runners). Signed-off-by: Daniel Golle --- target/linux/mediatek/image/filogic.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 5c8b47c662..7159917ff4 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -58,9 +58,12 @@ metadata_gl_json = \ define Build/append-gl-metadata $(if $(SUPPORTED_DEVICES),-echo $(call metadata_gl_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@) - [ ! -s "$(BUILD_KEY)" -o ! -s "$@" ] || { \ + sha256sum "$@" | cut -d" " -f1 > "$@.sha256sum" + [ ! -s "$(BUILD_KEY)" -o ! -s "$(BUILD_KEY).ucert" -o ! -s "$@" ] || { \ + cp "$(BUILD_KEY).ucert" "$@.ucert" ;\ usign -S -m "$@" -s "$(BUILD_KEY)" -x "$@.sig" ;\ - fwtool -S "$@.sig" "$@" ;\ + ucert -A -c "$@.ucert" -x "$@.sig" ;\ + fwtool -S "$@.ucert" "$@" ;\ } endef -- 2.30.2