From 42e478eb0dbfce71ba21d2a6ed7297ec6db8cc19 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Sun, 13 Dec 2020 14:36:17 -1000 Subject: [PATCH] build/json: add filesystem information Some images are created using different filesystems, most popular squashfs and ext4. To allow downstream projects to distinguesh between those, add the `filesystem` information to created json files. Signed-off-by: Paul Spooren (cherry picked from commit bc0ffff36a0bd8043e958913f574cb8d2a79e93d) --- include/image.mk | 1 + scripts/json_add_image_info.py | 1 + 2 files changed, 2 insertions(+) diff --git a/include/image.mk b/include/image.mk index a13f37f886..ee9885c8f7 100644 --- a/include/image.mk +++ b/include/image.mk @@ -534,6 +534,7 @@ define Device/Build/image BIN_DIR="$(BIN_DIR)" \ IMAGE_NAME="$(IMAGE_NAME)" \ IMAGE_TYPE=$(word 1,$(subst ., ,$(2))) \ + IMAGE_FILESYSTEM="$(1)" \ IMAGE_PREFIX="$(IMAGE_PREFIX)" \ DEVICE_TITLE="$(DEVICE_TITLE)" \ DEVICE_PACKAGES="$(DEVICE_PACKAGES)" \ diff --git a/scripts/json_add_image_info.py b/scripts/json_add_image_info.py index d1599b514a..9a640ad468 100755 --- a/scripts/json_add_image_info.py +++ b/scripts/json_add_image_info.py @@ -37,6 +37,7 @@ image_info = { "images": [ { "type": getenv("IMAGE_TYPE"), + "filesystem": getenv("IMAGE_FILESYSTEM"), "name": getenv("IMAGE_NAME"), "sha256": image_hash, }