diff options
| -rw-r--r-- | config/Config-build.in | 7 | ||||
| -rw-r--r-- | include/image.mk | 17 | ||||
| -rwxr-xr-x | scripts/json_add_image_info.py | 42 |
3 files changed, 65 insertions, 1 deletions
diff --git a/config/Config-build.in b/config/Config-build.in index 35341833e3..9669fc86c7 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -7,6 +7,13 @@ menu "Global build settings" + config JSON_ADD_IMAGE_INFO + bool "Create JSON info files per build image" + default BUILDBOT + help + The JSON info files contain information about the device and + build images, stored next to the firmware images. + config ALL_NONSHARED bool "Select all target specific packages by default" select ALL_KMODS diff --git a/include/image.mk b/include/image.mk index 1538d83df3..2eedb43753 100644 --- a/include/image.mk +++ b/include/image.mk @@ -524,7 +524,20 @@ define Device/Build/image $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)) cp $$^ $$@ - + $(if $(CONFIG_JSON_ADD_IMAGE_INFO), \ + DEVICE_ID="$(DEVICE_NAME)" \ + BIN_DIR="$(BIN_DIR)" \ + IMAGE_NAME="$(IMAGE_NAME)" \ + IMAGE_TYPE=$(word 1,$(subst ., ,$(2))) \ + IMAGE_PREFIX="$(IMAGE_PREFIX)" \ + DEVICE_TITLE="$(DEVICE_TITLE)" \ + TARGET="$(BOARD)" \ + SUBTARGET="$(SUBTARGET)" \ + VERSION_NUMBER="$(VERSION_NUMBER)" \ + VERSION_CODE="$(VERSION_CODE)" \ + SUPPORTED_DEVICES="$(SUPPORTED_DEVICES)" \ + $(TOPDIR)/scripts/json_add_image_info.py \ + ) endef define Device/Build/artifact @@ -542,6 +555,8 @@ define Device/Build/artifact endef define Device/Build + $(shell rm -f $(BIN_DIR)/$(IMG_PREFIX)-$(1).json) + $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1))) $(call Device/Build/kernel,$(1)) diff --git a/scripts/json_add_image_info.py b/scripts/json_add_image_info.py new file mode 100755 index 0000000000..4a90eb95cf --- /dev/null +++ b/scripts/json_add_image_info.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python3 + +import json +import os +import hashlib + + +def e(variable, default=None): + return os.environ.get(variable, default) + + +json_path = "{}{}{}.json".format(e("BIN_DIR"), os.sep, e("IMAGE_PREFIX")) + +with open(os.path.join(e("BIN_DIR"), e("IMAGE_NAME")), "rb") as image_file: + image_hash = hashlib.sha256(image_file.read()).hexdigest() + + +def get_titles(): + return [{"title": e("DEVICE_TITLE")}] + + +if not os.path.exists(json_path): + device_info = { + "id": e("DEVICE_ID"), + "image_prefix": e("IMAGE_PREFIX"), + "images": [], + "metadata_version": 1, + "supported_devices": e("SUPPORTED_DEVICES").split(), + "target": "{}/{}".format(e("TARGET"), e("SUBTARGET", "generic")), + "titles": get_titles(), + "version_commit": e("VERSION_CODE"), + "version_number": e("VERSION_NUMBER"), + } +else: + with open(json_path, "r") as json_file: + device_info = json.load(json_file) + +image_info = {"type": e("IMAGE_TYPE"), "name": e("IMAGE_NAME"), "sha256": image_hash} +device_info["images"].append(image_info) + +with open(json_path, "w") as json_file: + json.dump(device_info, json_file, sort_keys=True, indent=" ") |