20 Commits

Author SHA1 Message Date
sskaje
bf66214dad T5122: Move archive-areas to defaults.toml to support non-free-firmware repository 2023-03-29 16:49:32 +08:00
Daniil Baturin
b55bf1b1c5
Merge pull request #285 from jsimpso/bootloaders
T4796: Allow configuration of 'bootloader' param
2022-11-12 17:02:36 +00:00
James Simpson
2ade1d9e66 T4796: Allow configuration of 'bootloader' param
Remove hard-coded values for "bootloader" when creating the live-build,
replaced with the value of `bootloaders`.

Set the current value to the default value if not specified, via
`defaults.toml`.

Add the default for arm64 as `grub-efi`.
2022-11-12 17:34:50 +08:00
James Simpson
95620ef20f T4796: Honor additional_repositories
Currently, additional_repositories in the effective build_config are
ignored due to a bug wherein all values end up under
`args['custom_apt_entry']` rather than
`build_config['custom_apt_entry']`.

This change fixes that, ensuring that the content of
`build_config['additional_repositories]` is added to
`build_config['custom_apt_entry']` alongside the command-line arguments.
2022-11-12 15:56:14 +08:00
Christian Poessinger
62417d5b47
Merge pull request #280 from jsimpso/additional_repositories
T4796: Check more cautiously for presence of keys
2022-11-09 20:47:46 +01:00
Christian Poessinger
5203d31fa2
Merge pull request #281 from jsimpso/current
T4796: Default args to list where list is expected
2022-11-09 20:47:32 +01:00
Christian Poessinger
404791353f
Merge pull request #282 from jsimpso/merge_order
T4796: Prefer mix-in config over default config
2022-11-09 20:47:08 +01:00
Christian Poessinger
77f4ba82f2
Merge pull request #276 from ssasso/fix_T4800
Fix T4800: wrong chroot_includes_dir var reference
2022-11-09 20:46:43 +01:00
James Simpson
f4bc652b3a T4796: Prefer mix-in config over default config 2022-11-09 14:33:19 +08:00
James Simpson
71b8a3e159 T4796: Check more cautiously for presence of keys 2022-11-09 14:08:21 +08:00
James Simpson
2251cf0ad0 T4796: Default args to list where list is expected
custom_apt_entry, custom_apt_key, and custom_package are expected to
be lists, but when a value is not provided they default to None. This
prevents lists provided in mix-in or flavor configurations from being
merged as expected.

https://docs.python.org/3/library/argparse.html#default
2022-11-09 13:57:29 +08:00
James Simpson
f4bfaa9b97 T4796: Move and update custom_apt_entry logic
Rather than only looking at the default config, look at the merged
 build_config.

Check wether additional_repositories is actually defined before trying
 to reference it.
2022-11-07 14:26:49 +08:00
James Simpson
048aa40655 T4796: Fix ARCHIVES_DIR reference 2022-11-07 14:26:43 +08:00
James Simpson
509d4500da T4796: Correct function name from dict_merge 2022-11-07 14:26:40 +08:00
Stefano Sasso
ca6a82792c Fix T4800: wrong chroot_includes_dir var reference 2022-11-05 13:08:28 +00:00
Daniil Baturin
dbc78d089b T4796: fix argument order in merging default and custom options
in buils-vyos-image
2022-11-03 12:43:51 -04:00
Daniil Baturin
f39f4d1f23 T3664: dehardcode fields of the OS release file 2022-10-30 14:31:04 -04:00
sarthurdev
be065d568b build: T3664: Fix apt pinning file issue and use defaults for paths 2022-10-11 18:37:55 +02:00
sarthurdev
fbe8ee6e19 T3664: Add support for local packages, generate apt release pinning
* APT::Default-Release caused an issue when local packages present
2022-10-09 21:33:44 +02:00
Daniil Baturin
3979b25dcf T3664: initial implementation of the build flavor system 2022-10-06 17:55:01 -04:00