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>
This commit is contained in:
@@ -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,
|
||||
}
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user