| Message ID | 20201214004055.136747-1-mail@aparcar.org |
|---|---|
| State | Accepted |
| Delegated to: | Paul Spooren |
| Headers | show |
| Series | build/json: add filesystem information | expand |
Paul Spooren <mail@aparcar.org> [2020-12-13 14:40:55]: > 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 <mail@aparcar.org> Reviewed-by: Petr Štetiar <ynezz@true.cz> > --- > 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 3234956484..563d3d805d 100644 > --- a/include/image.mk > +++ b/include/image.mk > @@ -573,6 +573,7 @@ define Device/Build/image > SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \ > IMAGE_NAME="$(IMAGE_NAME)" \ > IMAGE_TYPE=$(word 1,$(subst ., ,$(2))) \ > + IMAGE_FILESYSTEM="$(1)" \ > IMAGE_PREFIX="$(IMAGE_PREFIX)" \ > DEVICE_VENDOR="$(DEVICE_VENDOR)" \ > DEVICE_MODEL="$(DEVICE_MODEL)" \ > diff --git a/scripts/json_add_image_info.py b/scripts/json_add_image_info.py > index ac907c777c..d394cf4d1f 100755 > --- a/scripts/json_add_image_info.py > +++ b/scripts/json_add_image_info.py > @@ -51,6 +51,7 @@ image_info = { > "images": [ > { > "type": getenv("IMAGE_TYPE"), > + "filesystem": getenv("IMAGE_FILESYSTEM"), > "name": getenv("IMAGE_NAME"), > "sha256": image_hash, > } > -- > 2.29.2 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel >
diff --git a/include/image.mk b/include/image.mk index 3234956484..563d3d805d 100644 --- a/include/image.mk +++ b/include/image.mk @@ -573,6 +573,7 @@ define Device/Build/image SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \ IMAGE_NAME="$(IMAGE_NAME)" \ IMAGE_TYPE=$(word 1,$(subst ., ,$(2))) \ + IMAGE_FILESYSTEM="$(1)" \ IMAGE_PREFIX="$(IMAGE_PREFIX)" \ DEVICE_VENDOR="$(DEVICE_VENDOR)" \ DEVICE_MODEL="$(DEVICE_MODEL)" \ diff --git a/scripts/json_add_image_info.py b/scripts/json_add_image_info.py index ac907c777c..d394cf4d1f 100755 --- a/scripts/json_add_image_info.py +++ b/scripts/json_add_image_info.py @@ -51,6 +51,7 @@ image_info = { "images": [ { "type": getenv("IMAGE_TYPE"), + "filesystem": getenv("IMAGE_FILESYSTEM"), "name": getenv("IMAGE_NAME"), "sha256": image_hash, }
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 <mail@aparcar.org> --- include/image.mk | 1 + scripts/json_add_image_info.py | 1 + 2 files changed, 2 insertions(+)