| Age | Commit message (Collapse) | Author |
|---|
|
build-script: T3664: Allowed all options in both config file and comm… (backport #622)
|
|
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)
|
|
T6356: normalize '.., ntp, server' path syntax in config.boot.default (backport #626)
|
|
(cherry picked from commit 04948aa983878e3edfca10e33fa620a4bc9303a2)
|
|
T6333 non-free-firmware to trixie (backport #614)
|
|
hooks: T6346: set default boot target to multi-user.target (backport #624)
|
|
(cherry picked from commit ca31af2cc33e965c4ebf98fd6f71f7a10c7f5032)
|
|
(cherry picked from commit 7f82191abea18bd3c789dabc4d815ea647fbee01)
|
|
build-script: T3664: Add flavor and architecture to image name (rework) (backport #620)
|
|
The previous version did not work for all flavor types. This one should be
universal.
(cherry picked from commit 31b720b8f100670f0e933dfbf9993a5315f5a904)
|
|
T3420: Remove service upnp (backport #618)
|
|
(cherry picked from commit 618b1379b710d72e85833d17b8d4eede25dea973)
|
|
build-script: T3664: Added flavor name to a target file name (backport #616)
|
|
Mark artifacts with a flavor name for better clarity.
(cherry picked from commit 5cbd14cc0f9a55e427d4bc13f036ea32da9a06aa)
|
|
build: T6330: fix indention of autogenerated release.pref.chroot (backport #612)
|
|
(cherry picked from commit 81be4c7f617f2ae450397495e46a91ed15cd7d2b)
|
|
build: T3664: include the architecture field in version data (backport #609)
|
|
(cherry picked from commit e832811c7978dffe7b40955778caa44e960f3a74)
|
|
build: T3664: use explicit defaults argument in the dict merging function (backport #606)
|
|
build: T3664: include build flavor name in the version file (backport #605)
|
|
(cherry picked from commit e215fad2739a38560726bdf72f6aaaa132854a38)
|
|
to make it clear what is merged into what
(cherry picked from commit 7656acd57de16c5bd8319c52c933383ca6a5d7a6)
|
|
build-script: T3664: Added more options to the image format (backport #603)
|
|
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)
|
|
apt: T3664: prefer packages from sagitta version
|
|
|
|
build: T3664: fix architecture mix-in loading (backport #600)
|
|
(cherry picked from commit e68e7fb9f59a58f8dbf5be48fd3f94260ea57ba7)
|
|
T6311: Docker add dependency asciidoc-base for nftables (backport #598)
|
|
Add dependency `asciidob-base` for build nftables
(cherry picked from commit ac1b06cf2c54e16547fef102e9e4245d5b4885bd)
|
|
build: T3664: modify the module-level template path instead of setting an environment variable (backport #596)
|
|
instead of setting an environment variable
(cherry picked from commit 58fbf3a226f05d4a5673dff92875e2490fdb1d10)
|
|
T6307: Add dependency procps to build vyos-1x (backport #594)
|
|
build: backport of new flavor build system
|
|
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)
|
|
(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)
|
|
(cherry picked from commit 425f78ff306d941f645adad763bbdfa68e6a41c2)
|
|
to avoid permission problems
(cherry picked from commit abb5b518ab1e14801e03779a75f78c0b4f86d804)
|
|
(cherry picked from commit 008bb5063d6794e5526e2c5ba9fa5e0c2d2866f2)
|
|
to simplify the now-rather-tricky build script invocation
(cherry picked from commit 29288652eaa245ccf7fe591f76460ef228d7dd4d)
|
|
(cherry picked from commit c535510bbc447abcf3b0e514bb6620ebf14ec8f1)
|
|
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)
|
