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 #600 from dmbaturin/T3664-mixin-path

Browse Source 
build: T3664: fix architecture mix-in loading
This commit is contained in:
Viacheslav Hletenko 2024-05-08 12:56:54 +03:00 committed by GitHub
commit 01d79fb3eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@ if __name__ == "__main__":
if has_nonempty_key(build_config, "architectures"): if has_nonempty_key(build_config, "architectures"):
arch = build_config["architecture"] arch = build_config["architecture"]
if arch in build_config["architectures"]: if arch in build_config["architectures"]:
if has_nonempty_key(build_config["architectures"], "packages"): if has_nonempty_key(build_config["architectures"][arch], "packages"):
build_config["packages"] += build_config["architectures"][arch]["packages"] build_config["packages"] += build_config["architectures"][arch]["packages"]
## Check if image format is specified, ## Check if image format is specified,