summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-05-15build-script: T3664: Add flavor and architecture to image name (rework)zsdc
The previous version did not work for all flavor types. This one should be universal. (cherry picked from commit 31b720b8f100670f0e933dfbf9993a5315f5a904)
2024-05-14Merge pull request #619 from vyos/mergify/bp/sagitta/pr-618Christian Breunig
T3420: Remove service upnp (backport #618)
2024-05-14T3420: Remove service upnpViacheslav Hletenko
(cherry picked from commit 618b1379b710d72e85833d17b8d4eede25dea973)
2024-05-14Merge pull request #617 from vyos/mergify/bp/sagitta/pr-616John Estabrook
build-script: T3664: Added flavor name to a target file name (backport #616)
2024-05-14build-script: T3664: Added flavor name to a target file namezsdc
Mark artifacts with a flavor name for better clarity. (cherry picked from commit 5cbd14cc0f9a55e427d4bc13f036ea32da9a06aa)
2024-05-12Merge pull request #613 from vyos/mergify/bp/sagitta/pr-612Christian Breunig
build: T6330: fix indention of autogenerated release.pref.chroot (backport #612)
2024-05-12build: T6330: fix indention of autogenerated release.pref.chrootChristian Breunig
(cherry picked from commit 81be4c7f617f2ae450397495e46a91ed15cd7d2b)
2024-05-10Merge pull request #610 from vyos/mergify/bp/sagitta/pr-609Christian Breunig
build: T3664: include the architecture field in version data (backport #609)
2024-05-10build: T3664: include the architecture field in version dataDaniil Baturin
(cherry picked from commit e832811c7978dffe7b40955778caa44e960f3a74)
2024-05-09Merge pull request #607 from vyos/mergify/bp/sagitta/pr-606Daniil Baturin
build: T3664: use explicit defaults argument in the dict merging function (backport #606)
2024-05-09Merge pull request #608 from vyos/mergify/bp/sagitta/pr-605Daniil Baturin
build: T3664: include build flavor name in the version file (backport #605)
2024-05-09build: T3664: include build flavor name in the version fileDaniil Baturin
(cherry picked from commit e215fad2739a38560726bdf72f6aaaa132854a38)
2024-05-09build: T3664: use explicit defaults argument in the dict merging functionDaniil Baturin
to make it clear what is merged into what (cherry picked from commit 7656acd57de16c5bd8319c52c933383ca6a5d7a6)
2024-05-08Merge pull request #604 from vyos/mergify/bp/sagitta/pr-603Christian Breunig
build-script: T3664: Added more options to the image format (backport #603)
2024-05-08build-script: T3664: Added more options to the image formatzsdc
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)
2024-05-08Merge pull request #602 from vyos/c-po-patch-1Daniil Baturin
apt: T3664: prefer packages from sagitta version
2024-05-08apt: T3664: prefer packages from sagitta versionChristian Breunig
2024-05-08Merge pull request #601 from vyos/mergify/bp/sagitta/pr-600Viacheslav Hletenko
build: T3664: fix architecture mix-in loading (backport #600)
2024-05-08build: T3664: fix architecture mix-in loadingDaniil Baturin
(cherry picked from commit e68e7fb9f59a58f8dbf5be48fd3f94260ea57ba7)
2024-05-07Merge pull request #599 from vyos/mergify/bp/sagitta/pr-598Viacheslav Hletenko
T6311: Docker add dependency asciidoc-base for nftables (backport #598)
2024-05-07T6311: Docker add dependency asciidoc-base for nftablesViacheslav Hletenko
Add dependency `asciidob-base` for build nftables (cherry picked from commit ac1b06cf2c54e16547fef102e9e4245d5b4885bd)
2024-05-07Merge pull request #597 from vyos/mergify/bp/sagitta/pr-596Viacheslav Hletenko
build: T3664: modify the module-level template path instead of setting an environment variable (backport #596)
2024-05-07build: T3664: modify the module-level template pathDaniil Baturin
instead of setting an environment variable (cherry picked from commit 58fbf3a226f05d4a5673dff92875e2490fdb1d10)
2024-05-06Merge pull request #595 from vyos/mergify/bp/sagitta/pr-594Christian Breunig
T6307: Add dependency procps to build vyos-1x (backport #594)
2024-05-06Merge pull request #593 from c-po/flavor-backportChristian Breunig
build: backport of new flavor build system
2024-05-06T6307: Add dependency procps to build vyos-1xViacheslav Hletenko
This fixes the sysctl dependency ``` ====================================================================== ERROR: test_sysctl_read (test_utils.TestVyOSUtils.test_sysctl_read) ---------------------------------------------------------------------- Traceback (most recent call last): File "/vyos/work/tmp/vyos-1x/src/tests/test_utils.py", line 28, in test_sysctl_read self.assertEqual(sysctl_read('net.ipv4.conf.lo.forwarding'), '1') ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/vyos/work/tmp/vyos-1x/python/vyos/utils/system.py", line 28, in sysctl_read tmp = run(['sysctl', '-nb', name], capture_output=True) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3.11/subprocess.py", line 548, in run with Popen(*popenargs, **kwargs) as process: ^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3.11/subprocess.py", line 1024, in __init__ self._execute_child(args, executable, preexec_fn, close_fds, File "/usr/lib/python3.11/subprocess.py", line 1901, in _execute_child raise child_exception_type(errno_num, err_msg, err_filename) FileNotFoundError: [Errno 2] No such file or directory: 'sysctl' ``` (cherry picked from commit 9d07adceb77fe611d82b0242e28f1ca7c4637ef3)
2024-05-05build: T3664: fix regression and bug in clone vyos-1x repoJohn Estabrook
(cherry picked from commit 02c340d9d76ee89f47d7d6d245c5dea955a5f683)
2024-05-05build: T3664: clone vyos-1x under build dir instead of as submoduleJohn Estabrook
(cherry picked from commit a90809e213bb10aa17223687fe8a965050959869)
2024-05-05build: T3664: fail the build on external command errorsDaniil Baturin
(cherry picked from commit 7dfd9232da787a7befbc4338d4eb21fee4325174)
2024-05-05build: T3664: typo fixes and small refactoringDaniil Baturin
(cherry picked from commit f6b0809f47691a8c21718c4256d99b40c73c1564)
2024-05-05build: T3664: adjust the vyos-1x submodule path in scriptsDaniil Baturin
(cherry picked from commit ec42af75e0ab468e062add3852c80254d153c021)
2024-05-05build: T3664: add vyos-1x repo as packages/vyos-1x submoduleDaniil Baturin
(cherry picked from commit 425f78ff306d941f645adad763bbdfa68e6a41c2)
2024-05-05build: T3664: move sudo out of the make targetDaniil Baturin
to avoid permission problems (cherry picked from commit abb5b518ab1e14801e03779a75f78c0b4f86d804)
2024-05-05build: T3664: correct the parameterized make ruleDaniil Baturin
(cherry picked from commit 008bb5063d6794e5526e2c5ba9fa5e0c2d2866f2)
2024-05-05build: T3664: add a parameterized make rule for build targetsDaniil Baturin
to simplify the now-rather-tricky build script invocation (cherry picked from commit 29288652eaa245ccf7fe591f76460ef228d7dd4d)
2024-05-05docker: T3664: add dependencies for raw disk buildingDaniil Baturin
(cherry picked from commit c535510bbc447abcf3b0e514bb6620ebf14ec8f1)
2024-05-05fix path to versions fileJohn Estabrook
Signed-off-by: Daniil Baturin <daniil@vyos.io> (cherry picked from commit ed7bcbd0dbe496cee725136a86ac19f4370d482f)
2024-05-05build: T3664: add a sanity check for image_formatDaniil Baturin
and normalize it to a list if only one format is specified (cherry picked from commit 72c7c7ff99b86bb3c65b44f69e05cf40cb8367c0)
2024-05-05build: T3664: filter out non-TOML files from the build flavor dirDaniil Baturin
to avoid mistakenly listing auixilliary files like README as flavors (cherry picked from commit c07268987cb4f55a35240972e672e7d809f7ef4a)
2024-05-05Account for the working dir below the root in git invocationJohn Estabrook
Signed-off-by: Daniil Baturin <daniil@vyos.io> (cherry picked from commit 7fa66c77f19694e2cfd275785344f53518b7fb2f)
2024-05-05build: T3664: add support for building non-ISO flavorsDaniil Baturin
(cherry picked from commit a896176ad8a1e1c7ef440a31c5afcfad358ed309)
2024-05-05build scripts: T3664: move image build scripts to a dedicated directoryDaniil Baturin
to avoid a mix of image build scripts and ancilliary scripts in the same directory (cherry picked from commit 750819bfec5335566dfc48de1ab6dbbc869068a3)
2024-05-05build flavors: T3664: reimplement Dell VEP flavors using the new systemDaniil Baturin
(cherry picked from commit b35eb63db370e2ee9fc41af3ad1ccdc335bc4816)
2024-05-05build script: T3664: fix handling of missing or malformed flavor filesDaniil Baturin
(cherry picked from commit 65b0321a8b92a4fcbb211caeec31aaa82a3a490c)
2024-05-05chore: T671: remove unused scripts and references to themDaniil Baturin
(cherry picked from commit 5dcb6b771106df130b4884867dc28bd685b64e40)
2024-05-05build script: T5711: copy version.json to the ISO image in addition to the ↵Daniil Baturin
SquashFS image (cherry picked from commit f31701f1b48b696ed4176b8ae413aa956ff15c5c)
2024-05-04Merge pull request #592 from vyos/mergify/bp/sagitta/pr-591Christian Breunig
frr: T6283: T6250: add pending upstream patches (backport #591)
2024-05-04frr: T6250: add pending upstream patchChristian Breunig
(cherry picked from commit 38cae97177191ad6876a4ce7afb4f53b21bf746c)
2024-05-04frr: T6283: add pending upstream patchChristian Breunig
(cherry picked from commit 1b61973b9143aa8a04cc7c857ec567fa962e4e43)
2024-05-04Docker: T6283: T6250: no need to include rtrlib and libyang in generalChristian Breunig
FRR build tracks the rtrlib and libyang version, so only one place is needed to build to sources. (cherry picked from commit 6ff4b31c4a75583424edd0deb479d1dacc42d6b3)