mediatek: fix append-gl-metadata when running in buildbot
authorDaniel Golle <daniel@makrotopia.org>
Fri, 19 May 2023 08:31:36 +0000 (09:31 +0100)
committerDaniel Golle <daniel@makrotopia.org>
Fri, 19 May 2023 08:34:22 +0000 (09:34 +0100)
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 <daniel@makrotopia.org>
target/linux/mediatek/image/filogic.mk

index 5c8b47c662f3157e7f1d10f72a5ab609f20d6e7b..7159917ff45bbe33a302b889a776357ba0ef34ca 100644 (file)
@@ -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