diff options
| author | zsdc <taras@vyos.io> | 2024-05-14 19:32:14 +0300 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2024-05-14 21:00:20 +0300 |
| commit | 31b720b8f100670f0e933dfbf9993a5315f5a904 (patch) | |
| tree | af81f60280c15d37464d428467d5dd863b45695b /scripts/image-build/build-vyos-image | |
| parent | fabf5326b80519cee6a335a80d44d82a59550e3c (diff) | |
| download | vyos-build-31b720b8f100670f0e933dfbf9993a5315f5a904.tar.gz vyos-build-31b720b8f100670f0e933dfbf9993a5315f5a904.zip | |
build-script: T3664: Add flavor and architecture to image name (rework)
The previous version did not work for all flavor types. This one should be
universal.
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}") |