diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-11-06 23:00:11 +0100 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-11-06 23:00:11 +0100 |
| commit | b125a3f53cf38fab7ad1a8b3bbc43bb409409437 (patch) | |
| tree | d4abe19549237e05be24fc6df00dd1d684402eb3 /data | |
| parent | 6c41221cae14717d9a6d7e99233ddc404cdcc283 (diff) | |
| parent | 33f15da7d481f7fc1b43266ae3cc89234a5a80ea (diff) | |
| download | vyos-build-b125a3f53cf38fab7ad1a8b3bbc43bb409409437.tar.gz vyos-build-b125a3f53cf38fab7ad1a8b3bbc43bb409409437.zip | |
Merge branch 'vyos:current' into current
Diffstat (limited to 'data')
| -rw-r--r-- | data/architectures/amd64.toml | 13 | ||||
| -rw-r--r-- | data/architectures/arm64.toml | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml index 8a4ef9d0..9ab1c03b 100644 --- a/data/architectures/amd64.toml +++ b/data/architectures/amd64.toml @@ -1,8 +1,3 @@ -additional_repositories = [ - "deb [arch=amd64] https://packages.vyos.net/saltproject/debian/11/amd64/3005 bullseye main", - "deb https://repo.zabbix.com/zabbix/6.0/debian bookworm main" -] - # Packages added to images for x86 by default packages = [ "grub2", @@ -13,3 +8,11 @@ packages = [ "vyos-intel-ixgbe", "vyos-intel-ixgbevf", ] + +[additional_repositories.salt] + architecture = "amd64" + url = "https://packages.vyos.net/saltproject/debian/11/amd64/3005" + distribution = "bullseye" + +[additional_repositories.zabbix] + url = "https://repo.zabbix.com/zabbix/6.0/debian" diff --git a/data/architectures/arm64.toml b/data/architectures/arm64.toml index bf9ef8ee..ebf14ef4 100644 --- a/data/architectures/arm64.toml +++ b/data/architectures/arm64.toml @@ -1,10 +1,13 @@ -additional_repositories = [ - "deb [arch=arm64] https://packages.vyos.net/saltproject/debian/11/arm64/3005 bullseye main", - "deb https://repo.zabbix.com/zabbix/6.0/debian-arm64 bookworm main" -] - # Packages included in ARM64 images by default packages = [ "grub-efi-arm64", ] bootloaders = "grub-efi" + +[additional_repositories.salt] + architecture = "arm64" + url = "https://packages.vyos.net/saltproject/debian/11/amd64/3005" + distribution = "bullseye" + +[additional_repositories.zabbix] + url = "https://repo.zabbix.com/zabbix/6.0/debian-arm64" |