[LEDE-DEV] [RFC 3/4] build: add support code for appending metadata to images

Felix Fietkau nbd at nbd.name
Mon Nov 14 08:40:07 PST 2016


Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 include/image-commands.mk | 18 ++++++++++++++++++
 include/image.mk          |  5 ++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 1d4bdfc..3376a48 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -185,3 +185,21 @@ define Build/relocate-kernel
 	mv "$@.new" "$@"
 	rm -rf $@.relocate
 endef
+
+json_quote=$(subst ','\'',$(subst ",\",$(1)))
+#")'
+metadata_devices=$(if $(1),$(patsubst $(comma)%,%,$(join $(comma),$(strip $(foreach v,$(1),"$(call json_quote,$(v))")))))
+metadata_json = \
+	'{ $(if $(IMAGE_METADATA),$(IMAGE_METADATA)$(comma)) \
+		"supported_devices":[$(call metadata_devices,$(1))], \
+		"version": { \
+			"dist": "$(call json_quote,$(VERSION_DIST))", \
+			"version": "$(call json_quote,$(VERSION_NUMBER))", \
+			"revision": "$(call json_quote,$(REVISION))", \
+			"board": "$(call json_quote,$(BOARD))" \
+		} \
+	}'
+
+define Build/append-metadata
+	$(if $(SUPPORTED_DEVICES),echo $(call metadata_json,$(SUPPORTED_DEVICES)) | fwtool -I - $@)
+endef
diff --git a/include/image.mk b/include/image.mk
index 8b183ab..d1dcdd6 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -346,6 +346,8 @@ define Device/Init
 
   BOARD_NAME :=
   UIMAGE_NAME :=
+  SUPPORTED_DEVICES :=
+  IMAGE_METADATA :=
 
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
 endef
@@ -355,7 +357,8 @@ DEFAULT_DEVICE_VARS := \
   DEVICE_DTS DEVICE_DTS_DIR BOARD_NAME CMDLINE \
   UBOOTENV_IN_UBI KERNEL_IN_UBI \
   BLOCKSIZE PAGESIZE SUBPAGESIZE VID_HDR_OFFSET \
-  UBINIZE_OPTS UIMAGE_NAME UBINIZE_PARTS
+  UBINIZE_OPTS UIMAGE_NAME UBINIZE_PARTS \
+  SUPPORTED_DEVICES IMAGE_METADATA
 
 define Device/ExportVar
   $(1) : $(2):=$$($(2))
-- 
2.10.1




More information about the Lede-dev mailing list