Age | Commit message (Collapse) | Author |
|
(cherry picked from commit 9928925b3b34e4a42099781430a0063292a9d0fe)
|
|
(cherry picked from commit 893a90fa6016b58c8f5802265599d9d19cd4f0dc)
|
|
(cherry picked from commit 4112d47e33d7ae87e21a47d33a4e2e6112ccfd8f)
|
|
|
|
|
|
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)
|
|
The previous version did not work for all flavor types. This one should be
universal.
(cherry picked from commit 31b720b8f100670f0e933dfbf9993a5315f5a904)
|
|
Mark artifacts with a flavor name for better clarity.
(cherry picked from commit 5cbd14cc0f9a55e427d4bc13f036ea32da9a06aa)
|
|
(cherry picked from commit 81be4c7f617f2ae450397495e46a91ed15cd7d2b)
|
|
(cherry picked from commit e832811c7978dffe7b40955778caa44e960f3a74)
|
|
build: T3664: use explicit defaults argument in the dict merging function (backport #606)
|
|
(cherry picked from commit e215fad2739a38560726bdf72f6aaaa132854a38)
|
|
to make it clear what is merged into what
(cherry picked from commit 7656acd57de16c5bd8319c52c933383ca6a5d7a6)
|
|
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)
|
|
(cherry picked from commit e68e7fb9f59a58f8dbf5be48fd3f94260ea57ba7)
|
|
instead of setting an environment variable
(cherry picked from commit 58fbf3a226f05d4a5673dff92875e2490fdb1d10)
|
|
(cherry picked from commit 02c340d9d76ee89f47d7d6d245c5dea955a5f683)
|
|
(cherry picked from commit a90809e213bb10aa17223687fe8a965050959869)
|
|
(cherry picked from commit 7dfd9232da787a7befbc4338d4eb21fee4325174)
|
|
(cherry picked from commit f6b0809f47691a8c21718c4256d99b40c73c1564)
|
|
(cherry picked from commit ec42af75e0ab468e062add3852c80254d153c021)
|
|
Signed-off-by: Daniil Baturin <daniil@vyos.io>
(cherry picked from commit ed7bcbd0dbe496cee725136a86ac19f4370d482f)
|
|
and normalize it to a list if only one format is specified
(cherry picked from commit 72c7c7ff99b86bb3c65b44f69e05cf40cb8367c0)
|
|
to avoid mistakenly listing auixilliary files like README
as flavors
(cherry picked from commit c07268987cb4f55a35240972e672e7d809f7ef4a)
|
|
Signed-off-by: Daniil Baturin <daniil@vyos.io>
(cherry picked from commit 7fa66c77f19694e2cfd275785344f53518b7fb2f)
|
|
(cherry picked from commit a896176ad8a1e1c7ef440a31c5afcfad358ed309)
|
|
to avoid a mix of image build scripts and ancilliary scripts in the same directory
(cherry picked from commit 750819bfec5335566dfc48de1ab6dbbc869068a3)
|
|
(cherry picked from commit 65b0321a8b92a4fcbb211caeec31aaa82a3a490c)
|
|
(cherry picked from commit 5dcb6b771106df130b4884867dc28bd685b64e40)
|
|
SquashFS image
(cherry picked from commit f31701f1b48b696ed4176b8ae413aa956ff15c5c)
|
|
(cherry picked from commit 6fe57a7042e82af3a587376ab014d76dc0920e35)
|
|
T6238: Check pull request title action requires the python script (backport #560)
|
|
Commit 611cfc85c531 ("T6173: validate allowed characters in ISO image name")
missed the probability that version is a dict member bot empty.
(cherry picked from commit 801def2d7105acc45868c361730e5be5ab4c36ea)
|
|
The `check-pr-title-and-commit-messages.py` that used for the action
is not exists.
Add this script.
(cherry picked from commit 06d12a527eb6601e67c36a740c81974f64752abe)
|
|
Building custom VyOS version: 1.5-asdf%-202404081841
I: Checking if packages required for VyOS image build are installed
Version contained illegal character(s), allowed: abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-+
(cherry picked from commit 611cfc85c531f6b6c55f89503d6d2cdf84213317)
|
|
(cherry picked from commit 4a8bc369ef7c9ebd8e1ce0d4067fca5f474204a7)
|
|
build: T1449: add default_config field support in flavor files to allow people to easily include a custom default config
|
|
(cherry picked from commit 3494ab3e0a50ed701a4b127e51b919c2ceb61bc3)
|
|
to allow people to easily include a custom default config
|
|
|
|
Use single source for project related URLs that will later be consumed by the
MOTD template used.
(cherry picked from commit 7b89f74c316c278ff6af73e75f357139d56243da)
|
|
(cherry picked from commit 195c13022de0b022e054347f0170fb536f4e9b9b)
|
|
Commit 3979b25dcf ("T3664: initial implementation of the build flavor system")
removed the call to make-version-file, thus we can also drop the file itself.
(cherry picked from commit 8a49912cee67c916533fc8fceed76c94941cb2e5)
|
|
|
|
This was discussed in slack, where a user was missing the Git commit ID in his
custom build
Reason is/was:
git clone --single-branch -b 1.4.0-epa1 https://github.com/vyos/vyos-build
Checks out the 1.4.0-epa1 tag as HEAD and does not clone any branch information.
This results in:
>>> import git
>>> repo = git.Repo('.')
>>> repo.head.object.hexsha[:14]
'bcac2eb1f9b49c'
>>> git_branch = repo.active_branch.name
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib/python3/dist-packages/git/repo/base.py", line 881, in active_branch
return self.head.reference
^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/git/refs/symbolic.py", line 311, in _get_reference
raise TypeError("%s is a detached symbolic reference as it points to %r" % (self, sha))
TypeError: HEAD is a detached symbolic reference as it points to 'bcac2eb1f9b49cc15ebda65838e5465543dbb9c6'
during the build. The exception handler resets the branch and commit name to an empty string: https://github.com/vyos/vyos-build/blob/a3e60a00b400a1bad8609d5ce1abb0bb7abed7bc/scripts/build-vyos-image#L281-L296
This now adds a proper error message during build so it fails early.
(07:46) vyos_bld 08278c5a1172:/vyos/vyos-build # isobuild -test
Building custom VyOS version: 1.5-test-202402250746
I: Checking if packages required for VyOS image build are installed
build/config
Could not retrieve information from git: HEAD is a detached symbolic reference as it points to '39612f541e55bea19868f50f16d7a6c6e0034ed2'
(cherry picked from commit 7c27657c79046dac8ae509a4eacb1a3a152e2d23)
|
|
|
|
T2640: update VyOS in docker image to current version (backport #462)
|
|
(cherry picked from commit 64796852a4ba1eae5c7b436109365b798a99b38e)
|
|
Simply boot a live qemu version from the latest ISO build
(10:18) cpo lnx01:~/vyos-build [current] # sudo make qemu-live
if [ ! -f build/live-image-amd64.hybrid.iso ]; then
echo "Could not find build/live-image-amd64.hybrid.iso"
exit 1
fi
scripts/check-qemu-install --qemu-cmd build/live-image-amd64.hybrid.iso
INFO - Creating Disk image testinstall-20231119-101823-4483.img
SeaBIOS (version 1.16.2-debian-1.16.2-1)
Machine UUID f48b60b2-e6ad-49ef-9d09-4245d0585e52
Booting from DVD/CD...
ISOLINUX 6.04 20200816 ETCD Copyright (C) 1994-2015 H. Peter Anvin et al
(cherry picked from commit b3d0ebaf1d7d5b5a54be284e553defb8ed4a7a6f)
|
|
Use either "make oci" or call the script manually:
$ scripts/iso-to-oci build/live-image-amd64.hybrid.iso
I: mount ISO build/live-image-amd64.hybrid.iso
I: extracting squashfs content
I: generate OCI container image vyos-1.5-strongswan-202311241125.tar
I: to import the previously generated OCI image to your local images run:
docker import vyos-1.5-strongswan-202311241125.tar vyos:1.5-strongswan-202311241125 --change 'CMD [/sbin/init]'
(cherry picked from commit 499e8e1cbb90e24acf80d383a69e138cd745807c)
|