vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #620 from zdc/T3664-circinus

Browse Source 
build-script: T3664: Add flavor and architecture to image name (rework)
This commit is contained in:
Christian Breunig 2024-05-15 07:02:49 +02:00 committed by GitHub
commit eff3d4aab6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/image-build/build-vyos-image
View File

@ -489,7 +489,7 @@ if __name__ == "__main__":
iter(os.remove, artifacts) iter(os.remove, artifacts)
## Create the target ISO file path ## 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 ## Create live-build configuration files
@ -645,6 +645,6 @@ Pin-Priority: 600
for f in other_formats: for f in other_formats:
image_ext = build_config.get("image_ext", f) image_ext = build_config.get("image_ext", f)
image_opts = build_config.get("image_opts", "") 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}") print(f"I: Building {f} file {target}")
cmd(f"qemu-img convert -f raw -O {f} {image_opts} {raw_image} {target}") cmd(f"qemu-img convert -f raw -O {f} {image_opts} {raw_image} {target}")

2
scripts/image-build/raw_image.py
View File

@ -201,7 +201,7 @@ def create_raw_image(build_config, iso_file, work_dir):
con.build_config = build_config con.build_config = build_config
version_data = read_version_data(con.iso_dir) version_data = read_version_data(con.iso_dir)
version = version_data['version'] 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}") print(f"I: Building raw file {raw_file}")
create_disk(raw_file, build_config["disk_size"]) create_disk(raw_file, build_config["disk_size"])
setup_loop_device(con, raw_file) setup_loop_device(con, raw_file)