summaryrefslogtreecommitdiff
path: root/scripts
AgeCommit message (Collapse)Author
2024-04-13T6173: fix TypeError: 'NoneType' object is not iterableChristian Breunig
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)
2024-04-10T6173: validate allowed characters in ISO image nameChristian Breunig
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)
2024-04-08image-tools: T6207: update test script for prompt for boot configJohn Estabrook
(cherry picked from commit 4a8bc369ef7c9ebd8e1ce0d4067fca5f474204a7)
2024-03-16Merge pull request #532 from dmbaturin/T1449-default-config-field-sagittaDaniil Baturin
build: T1449: add default_config field support in flavor files to allow people to easily include a custom default config
2024-03-16T6115: fix failing builds from detached HEAD (e.g. git tags)sfinke0
(cherry picked from commit 3494ab3e0a50ed701a4b127e51b919c2ceb61bc3)
2024-03-13build: T1449: add default_config field support in flavor filesDaniil Baturin
to allow people to easily include a custom default config
2024-03-13docker, build: T6119: use python3-tomli instead of python3-tomlDaniil Baturin
2024-03-02T6077: add bugtrcker, documentation and new URL to version fileChristian Breunig
Use single source for project related URLs that will later be consumed by the MOTD template used. (cherry picked from commit 7b89f74c316c278ff6af73e75f357139d56243da)
2024-03-02T3664: remove leading whitespaces from generated /usr/lib/os-releaseChristian Breunig
(cherry picked from commit 195c13022de0b022e054347f0170fb536f4e9b9b)
2024-03-02T3664: remove obsolete make-version-fileChristian Breunig
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)
2024-02-25T6065: Remove duplicated lines from build-vyos-image scripthcuk94
2024-02-25T6064: add build error if branch information from Git repository is missingChristian Breunig
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)
2024-02-24build: T3664: fix the chroot includes pathDaniil Baturin
2023-12-17Merge pull request #463 from vyos/mergify/bp/sagitta/pr-462Christian Breunig
T2640: update VyOS in docker image to current version (backport #462)
2023-12-16image: T4516: update test script for changes in prompts/partition idJohn Estabrook
(cherry picked from commit 64796852a4ba1eae5c7b436109365b798a99b38e)
2023-11-27Makefile: add new target qemu-liveChristian Breunig
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)
2023-11-27Makefile: T2640: add helper to convert ISO to OCI image to start a containerChristian Breunig
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)
2023-09-25ci/cd: update branch references current -> sagittaChristian Breunig
2023-09-22smoketest: T5607: adjust for non-deterministic scsi device probingJohn Estabrook
(cherry picked from commit ecd3727d634e1546448b8038f299b28a2e71dfcb)
2023-09-10T5562: Fix -smp syntax for qemu-system-x86_64Apachez
(cherry picked from commit fa1462aa6dfb3ca51fcc86bdbfb259cc3fe65981)
2023-09-09Testsuite: fix qemu SMP configurationChristian Breunig
(cherry picked from commit a863fe0b03cd2eb062eb97c5e47992b4e8e999c6)
2023-09-02live-build: add missing quotes on chroot-squashfs-compressionChristian Breunig
2023-09-02T5538: Change order within variable lb_config_tmpl to fit order of manpage ↵Apachez
and fix some typos
2023-09-02T5510: Shrink imagesize and improve read performance by changing mksquashfs ↵Apachez
syntax
2023-09-01T5510: Shrink imagesize and improve read performance by changing mksquashfs ↵Apachez
syntax
2023-03-29T5122: Move archive-areas to defaults.toml to support non-free-firmware ↵sskaje
repository
2023-02-22T5024: Try to shutdown several times for qemu install scriptViacheslav Hletenko
The first shutdown for qemu doesn't work Try to shutdown several times
2023-02-13debian: T5003: Increase VM memory - tests failed due to OOM conditionsarthurdev
2023-02-13debian: T5003: Update to to Debian 12 "Bookworm"sarthurdev
* Remove obsolete packages and dependencies
2022-11-12Merge pull request #285 from jsimpso/bootloadersDaniil Baturin
T4796: Allow configuration of 'bootloader' param
2022-11-12T4796: Allow configuration of 'bootloader' paramJames Simpson
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-12T4796: Honor additional_repositoriesJames Simpson
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-09Merge pull request #280 from jsimpso/additional_repositoriesChristian Poessinger
T4796: Check more cautiously for presence of keys
2022-11-09Merge pull request #281 from jsimpso/currentChristian Poessinger
T4796: Default args to list where list is expected
2022-11-09Merge pull request #282 from jsimpso/merge_orderChristian Poessinger
T4796: Prefer mix-in config over default config
2022-11-09Merge pull request #276 from ssasso/fix_T4800Christian Poessinger
Fix T4800: wrong chroot_includes_dir var reference
2022-11-09T4796: Prefer mix-in config over default configJames Simpson
2022-11-09T4796: Check more cautiously for presence of keysJames Simpson
2022-11-09 T4796: Default args to list where list is expectedJames Simpson
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-07T4796: Move and update custom_apt_entry logicJames Simpson
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-07T4796: Fix ARCHIVES_DIR referenceJames Simpson
2022-11-07T4796: Correct function name from dict_mergeJames Simpson
2022-11-05Fix T4800: wrong chroot_includes_dir var referenceStefano Sasso
2022-11-03T4796: fix argument order in merging default and custom optionsDaniil Baturin
in buils-vyos-image
2022-10-30T3664: dehardcode fields of the OS release fileDaniil Baturin
2022-10-11build: T3664: Fix apt pinning file issue and use defaults for pathssarthurdev
2022-10-09T3664: Add support for local packages, generate apt release pinningsarthurdev
* APT::Default-Release caused an issue when local packages present
2022-10-07Testsuite: T3664: move to new toml based input filesChristian Poessinger
2022-10-06T3664: initial implementation of the build flavor systemDaniil Baturin
2022-06-30smoketest: Move PKI file generate to script in vyos-1xsarthurdev
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 14:28:18 +0000