| Age | Commit message (Collapse) | Author |
|---|
|
|
|
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)
|
|
|
|
(cherry picked from commit ecd3727d634e1546448b8038f299b28a2e71dfcb)
|
|
(cherry picked from commit fa1462aa6dfb3ca51fcc86bdbfb259cc3fe65981)
|
|
(cherry picked from commit a863fe0b03cd2eb062eb97c5e47992b4e8e999c6)
|
|
|
|
and fix some typos
|
|
syntax
|
|
syntax
|
|
repository
|
|
The first shutdown for qemu doesn't work
Try to shutdown several times
|
|
|
|
* Remove obsolete packages and dependencies
|
|
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`.
|
|
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.
|
|
T4796: Check more cautiously for presence of keys
|
|
T4796: Default args to list where list is expected
|
|
T4796: Prefer mix-in config over default config
|
|
Fix T4800: wrong chroot_includes_dir var reference
|
|
|
|
|
|
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
|
|
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.
|
|
|
|
|
|
|
|
in buils-vyos-image
|
|
|
|
|
|
* APT::Default-Release caused an issue when local packages present
|
|
|
|
|
|
|
|
|
|
|
|
QEMU manually
|
|
|
|
|
|
|
|
|
|
build host"
This reverts commit a5e591fa9b66b229f7296de177a570c7b7126be4.
|
|
|
|
|
