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 #282 from jsimpso/merge_order

Browse Source 
T4796: Prefer mix-in config over default config
This commit is contained in:
Christian Poessinger 2022-11-09 20:47:08 +01:00 committed by GitHub
commit 404791353f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build-vyos-image
View File

@ -216,15 +216,15 @@ if __name__ == "__main__":
## Load the flavor file and mix-ins
with open(make_toml_path(defaults.BUILD_TYPES_DIR, build_config["build_type"]), 'r') as f:
build_type_config = toml.load(f)
build_config = merge_dicts(build_config, build_type_config)
build_config = merge_dicts(build_type_config, build_config)
with open(make_toml_path(defaults.BUILD_ARCHES_DIR, build_config["architecture"]), 'r') as f:
build_arch_config = toml.load(f)
build_config = merge_dicts(build_config, build_arch_config)
build_config = merge_dicts(build_arch_config, build_config)
with open(make_toml_path(defaults.BUILD_FLAVORS_DIR, build_config["build_flavor"]), 'r') as f:
flavor_config = toml.load(f)
build_config = merge_dicts(build_config, flavor_config)
build_config = merge_dicts(flavor_config, build_config)
## Rename and merge some fields for simplicity
## E.g. --custom-packages is for the user, but internally