aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/json_add_image_info.py
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-02-22 15:55:43 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-02-25 18:11:06 +0100
commitef2cb8572b48f1e1964b4d1d014d16cb721b5175 (patch)
tree595fb4d12164bfa78c653c897428002ec69dfd1d /scripts/json_add_image_info.py
parent198385b69de14494e282035a2293fc253f839864 (diff)
downloadupstream-ef2cb8572b48f1e1964b4d1d014d16cb721b5175.tar.gz
upstream-ef2cb8572b48f1e1964b4d1d014d16cb721b5175.tar.bz2
upstream-ef2cb8572b48f1e1964b4d1d014d16cb721b5175.zip
treewide: rename IMAGE_PREFIX/IMAGE_NAME to DEVICE_IMG_*
We so far had two variables IMG_PREFIX and IMAGE_PREFIX with different content. Since these names are obviously quite confusing, this patch renames the latter to DEVICE_IMG_PREFIX, as it's a device-dependent variable, while IMG_PREFIX is only (sub)target-dependent. For consistency, also rename IMAGE_NAME to DEVICE_IMG_NAME, as that's a device-dependent variable as well. Cc: Paul Spooren <mail@aparcar.org> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'scripts/json_add_image_info.py')
-rwxr-xr-xscripts/json_add_image_info.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/json_add_image_info.py b/scripts/json_add_image_info.py
index d394cf4d1f..38cd3c487d 100755
--- a/scripts/json_add_image_info.py
+++ b/scripts/json_add_image_info.py
@@ -12,7 +12,7 @@ if len(argv) != 2:
json_path = Path(argv[1])
bin_dir = Path(getenv("BIN_DIR"))
-image_file = bin_dir / getenv("IMAGE_NAME")
+image_file = bin_dir / getenv("DEVICE_IMG_NAME")
if not image_file.is_file():
print("Skip JSON creation for non existing image ", image_file)
@@ -47,12 +47,12 @@ image_info = {
"source_date_epoch": getenv("SOURCE_DATE_EPOCH"),
"profiles": {
device_id: {
- "image_prefix": getenv("IMAGE_PREFIX"),
+ "image_prefix": getenv("DEVICE_IMG_PREFIX"),
"images": [
{
"type": getenv("IMAGE_TYPE"),
"filesystem": getenv("IMAGE_FILESYSTEM"),
- "name": getenv("IMAGE_NAME"),
+ "name": getenv("DEVICE_IMG_NAME"),
"sha256": image_hash,
}
],