mirror of
https://github.com/FUjr/gl-infra-builder.git
synced 2025-12-16 17:15:08 +00:00
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 6ab838f58b32024c5bb45fb6cec65a2148f0e599 Mon Sep 17 00:00:00 2001
|
|
From: gl-dengxinfa <xinfa.deng@gl-inet.com>
|
|
Date: Tue, 27 Sep 2022 12:12:00 +0800
|
|
Subject: [PATCH] fix: add append-gl-metadata
|
|
|
|
---
|
|
include/image-commands.mk | 30 ++++++++++++++++++++++++++++++
|
|
1 file changed, 30 insertions(+)
|
|
|
|
diff --git a/include/image-commands.mk b/include/image-commands.mk
|
|
index 402e3d71ed..6eeb246c17 100644
|
|
--- a/include/image-commands.mk
|
|
+++ b/include/image-commands.mk
|
|
@@ -98,6 +98,36 @@ define Build/append-metadata
|
|
}
|
|
endef
|
|
|
|
+metadata_gl_json = \
|
|
+ '{ $(if $(IMAGE_METADATA),$(IMAGE_METADATA)$(comma)) \
|
|
+ "metadata_version": "1.1", \
|
|
+ "compat_version": "$(call json_quote,$(compat_version))", \
|
|
+ $(if $(DEVICE_COMPAT_MESSAGE),"compat_message": "$(call json_quote,$(DEVICE_COMPAT_MESSAGE))"$(comma)) \
|
|
+ $(if $(filter-out 1.0,$(compat_version)),"new_supported_devices": \
|
|
+ [$(call metadata_devices,$(SUPPORTED_DEVICES))]$(comma) \
|
|
+ "supported_devices": ["$(call json_quote,$(legacy_supported_message))"$(comma)$(call metadata_devices,$(OLD_SUPPORTED_DEVICES))]$(comma)) \
|
|
+ $(if $(filter 1.0,$(compat_version)),"supported_devices":[$(call metadata_devices,$(SUPPORTED_DEVICES))]$(comma)) \
|
|
+ "version": { \
|
|
+ "release": "$(shell cat $(TOPDIR)/release)", \
|
|
+ "date": "$(shell TZ='Asia/Chongqing' date '+%Y%m%d%H%M%S')", \
|
|
+ "dist": "$(call json_quote,$(VERSION_DIST))", \
|
|
+ "version": "$(call json_quote,$(VERSION_NUMBER))", \
|
|
+ "revision": "$(call json_quote,$(REVISION))", \
|
|
+ "target": "$(call json_quote,$(TARGETID))", \
|
|
+ "board": "$(call json_quote,$(if $(BOARD_NAME),$(BOARD_NAME),$(DEVICE_NAME)))" \
|
|
+ }, \
|
|
+ "upgrade_control":"$(shell python3 $(TOPDIR)/make_gl_metadata.py)", \
|
|
+ "release_note":"$(shell sed ':a;N;s/\n/\\n/g;s/\r/\\r/g;ta' $(TOPDIR)/gl_release_note)" \
|
|
+ }'
|
|
+
|
|
+define Build/append-gl-metadata
|
|
+ $(if $(SUPPORTED_DEVICES),-echo $(call metadata_gl_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@)
|
|
+ [ ! -s "$(BUILD_KEY)" -o ! -s "$@" ] || { \
|
|
+ usign -S -m "$@" -s "$(BUILD_KEY)" -x "$@.sig" ;\
|
|
+ fwtool -S "$@.sig" "$@" ;\
|
|
+ }
|
|
+endef
|
|
+
|
|
define Build/append-rootfs
|
|
dd if=$(IMAGE_ROOTFS) >> $@
|
|
endef
|
|
--
|
|
2.34.1
|
|
|