diff options
| author | zdc <zdc@users.noreply.github.com> | 2024-05-15 14:17:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 14:17:08 +0300 |
| commit | 45c6bb7d085cd5ba87968704fa98d2095e4cec95 (patch) | |
| tree | 541aa0ae7ea3f2a50d44a1c15923bdb054c3d8c3 /scripts/image-build/build-vyos-image | |
| parent | 3d2c16976e0b453772d96e16df42b5629942691c (diff) | |
| parent | 5d15b0a7507f07aac9cc0d4e876cc5981f66441d (diff) | |
| download | vyos-build-45c6bb7d085cd5ba87968704fa98d2095e4cec95.tar.gz vyos-build-45c6bb7d085cd5ba87968704fa98d2095e4cec95.zip | |
Merge pull request #621 from vyos/mergify/bp/sagitta/pr-620
build-script: T3664: Add flavor and architecture to image name (rework) (backport #620)
Diffstat (limited to 'scripts/image-build/build-vyos-image')
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 5bf5803d..80339308 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -489,7 +489,7 @@ if __name__ == "__main__": iter(os.remove, artifacts) ## Create the target ISO file path - iso_file = "vyos-{0}-{1}.iso".format(version_data["version"], build_config["architecture"]) + iso_file = f"vyos-{version_data['version']}-{build_config['build_flavor']}-{build_config['architecture']}.iso" ## Create live-build configuration files @@ -645,6 +645,6 @@ Pin-Priority: 600 for f in other_formats: image_ext = build_config.get("image_ext", f) image_opts = build_config.get("image_opts", "") - target = f"{os.path.splitext(raw_image)[0]}-{build_config['build_flavor']}.{image_ext}" + 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} {image_opts} {raw_image} {target}") |