Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build-script: T3664: Add flavor and architecture to image name (rework) #620

Merged
merged 1 commit into from
May 15, 2024
Merged

build-script: T3664: Add flavor and architecture to image name (rework) #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/image-build/build-vyos-image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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}")
2 changes: 1 addition & 1 deletion scripts/image-build/raw_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ def create_raw_image(build_config, iso_file, work_dir):
con.build_config = build_config
version_data = read_version_data(con.iso_dir)
version = version_data['version']
raw_file = f"vyos-{version}.raw"
raw_file = f"vyos-{version}-{build_config['build_flavor']}-{build_config['architecture']}.raw"
print(f"I: Building raw file {raw_file}")
create_disk(raw_file, build_config["disk_size"])
setup_loop_device(con, raw_file)
Expand Down
Loading