[openwrt/openwrt] mediatek: fix append-gl-metadata when running in buildbot

LEDE Commits lede-commits at lists.infradead.org
Fri May 19 01:34:57 PDT 2023


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/a384490b102c72b262b716ec746e75dc27f89727

commit a384490b102c72b262b716ec746e75dc27f89727
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Fri May 19 09:31:36 2023 +0100

    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 <daniel at makrotopia.org>
---
 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
 




More information about the lede-commits mailing list