vyos-build.git/scripts/image-build, branch 1.4.0 VyOS image build scripts (mirror of https://github.com/vyos/vyos-build.git) https://git.amelek.net/vyos/vyos-build.git/atom?h=1.4.0 2024-05-23T19:40:48+00:00 T6386: remove unused import 2024-05-23T19:40:48+00:00 kumvijaya kumvijaya@gmail.com 2024-05-23T19:40:48+00:00 urn:sha1:5c9efd647aab5c1b9ca1149820afd9917331ca98 build-script: T3664: Allowed all options in both config file and command args 2024-05-17T13:38:51+00:00 zsdc taras@vyos.io 2024-05-15T13:48:35+00:00 urn:sha1:31304abadbe7414f59ac7f60fef366de25bb7139 Moved defaults away from argparser to `defaults.py`. This unlocks the ability to pass values that can be defined as command line arguments via a config file. With this change logic looks like this (in order of overrides). Pre-build config: `data/defaults.toml` -> `build-flavors/<flavor>.toml` -> `--<command line argument>` Build config: `defaults.py` -> `data/defaults.toml` -> `build-types/<type>.toml` -> `architectures/<architecture>.toml` -> `build-flavors/<flavor>.toml` -> `--<command line argument>` (cherry picked from commit 8186e82024cdeee9c6fd09bdd0603f4571842f42) build-script: T3664: Add flavor and architecture to image name (rework) 2024-05-15T05:03:24+00:00 zsdc taras@vyos.io 2024-05-14T16:32:14+00:00 urn:sha1:5d15b0a7507f07aac9cc0d4e876cc5981f66441d The previous version did not work for all flavor types. This one should be universal. (cherry picked from commit 31b720b8f100670f0e933dfbf9993a5315f5a904) build-script: T3664: Added flavor name to a target file name 2024-05-14T13:39:17+00:00 zsdc taras@vyos.io 2024-05-14T11:46:08+00:00 urn:sha1:ce18208904dba61cddacb6d41a54d3492b9d9d72 Mark artifacts with a flavor name for better clarity. (cherry picked from commit 5cbd14cc0f9a55e427d4bc13f036ea32da9a06aa) build: T6330: fix indention of autogenerated release.pref.chroot 2024-05-12T06:51:39+00:00 Christian Breunig christian@breunig.cc 2024-05-12T06:48:43+00:00 urn:sha1:ede38cd8bd37c4aa3591120903f7c97c09300dc1 (cherry picked from commit 81be4c7f617f2ae450397495e46a91ed15cd7d2b) build: T3664: include the architecture field in version data 2024-05-10T12:25:44+00:00 Daniil Baturin daniil@baturin.org 2024-05-09T16:43:57+00:00 urn:sha1:1776371601934f75b0d3e36a613d66ffaccb8fe9 (cherry picked from commit e832811c7978dffe7b40955778caa44e960f3a74) Merge pull request #607 from vyos/mergify/bp/sagitta/pr-606 2024-05-09T14:37:54+00:00 Daniil Baturin daniil@vyos.io 2024-05-09T14:37:54+00:00 urn:sha1:aaf2b749f9fadcdc8855a12eb87fe63418a46aa1 build: T3664: use explicit defaults argument in the dict merging function (backport #606) build: T3664: include build flavor name in the version file 2024-05-09T14:16:26+00:00 Daniil Baturin daniil@baturin.org 2024-05-08T18:31:03+00:00 urn:sha1:cfc40b2b719eb9fa7300fa505e8b9d194b941887 (cherry picked from commit e215fad2739a38560726bdf72f6aaaa132854a38) build: T3664: use explicit defaults argument in the dict merging function 2024-05-09T14:15:27+00:00 Daniil Baturin daniil@baturin.org 2024-05-09T10:12:24+00:00 urn:sha1:121c3ce51aba2767b59ab6cdb02dba9dac12db80 to make it clear what is merged into what (cherry picked from commit 7656acd57de16c5bd8319c52c933383ca6a5d7a6) build-script: T3664: Added more options to the image format 2024-05-08T18:15:32+00:00 zsdc taras@vyos.io 2024-05-08T17:56:54+00:00 urn:sha1:d9a3ce08325d84be4bcb94fece1af5ced03f76f6 Added two new options: - `image_ext`. Can be used if the file extension needs to be different than the image format - `image_opts`. Required if a target format needs extra options. (cherry picked from commit d144519a53d0b9c696159a51906685db88d5d9ed)