summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsdc <taras@vyos.io>2024-05-08 20:56:54 +0300
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-05-08 18:15:32 +0000
commitd9a3ce08325d84be4bcb94fece1af5ced03f76f6 (patch)
tree28db0390b993a13d9ae58e32fbb41fe57dcefc1d
parent9b3a86641e89c2df3523b86f7542089e796b1d7d (diff)
downloadvyos-build-d9a3ce08325d84be4bcb94fece1af5ced03f76f6.tar.gz
vyos-build-d9a3ce08325d84be4bcb94fece1af5ced03f76f6.zip
build-script: T3664: Added more options to the image format
Added two new options: - `image_ext`. Can be used if the file extension needs to be different than the image format - `image_opts`. Required if a target format needs extra options. (cherry picked from commit d144519a53d0b9c696159a51906685db88d5d9ed)
-rwxr-xr-xscripts/image-build/build-vyos-image6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image
index 75c9d0c6..721e743c 100755
--- a/scripts/image-build/build-vyos-image
+++ b/scripts/image-build/build-vyos-image
@@ -639,6 +639,8 @@ if __name__ == "__main__":
# Most other formats, thankfully, can be produced with just `qemu-img convert`
other_formats = filter(lambda x: x not in ["iso", "raw"], build_config["image_format"])
for f in other_formats:
- target = f"{os.path.splitext(raw_image)[0]}.{f}"
+ image_ext = build_config.get("image_ext", f)
+ image_opts = build_config.get("image_opts", "")
+ target = f"{os.path.splitext(raw_image)[0]}.{image_ext}"
print(f"I: Building {f} file {target}")
- cmd(f"qemu-img convert -f raw -O {f} {raw_image} {target}")
+ cmd(f"qemu-img convert -f raw -O {f} {image_opts} {raw_image} {target}")