summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorsarthurdev <965089+sarthurdev@users.noreply.github.com>2023-02-12 20:46:12 +0100
committersarthurdev <965089+sarthurdev@users.noreply.github.com>2023-02-13 11:20:49 +0100
commit1e116e025439432cd42c3894dcaaafeb06bf8653 (patch)
treee7999e789a9a8af3dfdf6ee2733d69772b5e75bc /data
parentb00c41e6a547a3cd1f8dd74d70433e306265cb26 (diff)
downloadvyos-build-1e116e025439432cd42c3894dcaaafeb06bf8653.tar.gz
vyos-build-1e116e025439432cd42c3894dcaaafeb06bf8653.zip
debian: T5003: Update to to Debian 12 "Bookworm"
* Remove obsolete packages and dependencies
Diffstat (limited to 'data')
-rw-r--r--data/architectures/amd64.toml3
-rw-r--r--data/defaults.toml4
-rw-r--r--data/live-build-config/archives/pdns.key.chroot30
-rw-r--r--data/live-build-config/archives/pdns.pref.chroot3
4 files changed, 3 insertions, 37 deletions
diff --git a/data/architectures/amd64.toml b/data/architectures/amd64.toml
index abfec53a..c479ea9c 100644
--- a/data/architectures/amd64.toml
+++ b/data/architectures/amd64.toml
@@ -1,6 +1,5 @@
additional_repositories = [
- "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main",
- "deb [arch=amd64] http://repo.powerdns.com/debian bullseye-rec-48 main"
+ "deb [arch=amd64] https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main"
]
kernel_flavor = "amd64-vyos"
diff --git a/data/defaults.toml b/data/defaults.toml
index c09796df..975f89bb 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -2,7 +2,7 @@ build_type = "development"
architecture = "amd64"
-debian_distribution = "bullseye"
+debian_distribution = "bookworm"
debian_mirror = "http://deb.debian.org/debian"
debian_security_mirror = "http://deb.debian.org/debian-security"
@@ -17,4 +17,4 @@ bootloaders = "syslinux,grub-efi"
website_url = "https://vyos.io"
support_url = "https://support.vyos.io"
-bugtracker_url = "https://phabricator.vyos.net"
+bugtracker_url = "https://vyos.dev"
diff --git a/data/live-build-config/archives/pdns.key.chroot b/data/live-build-config/archives/pdns.key.chroot
deleted file mode 100644
index 9f59d9c9..00000000
--- a/data/live-build-config/archives/pdns.key.chroot
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mQINBFV2/GwBEADD4oJuwcLkYZD6R+PM0zKdZ04owicJ9e1nTbBb8OA+92TI0cJY
-8XGpjEJBRECOMJi9Gr6p3QxgZX1IQbiB/RJgRN0BYTZJ6BKobJAlSNsZBVH4wt/F
-Xg8IFXi8O8XNwrhhTHVLyhZxB5WIqd8Xgdb39t7qcKLLuhdzH+hTWtGNaC3UJ1xz
-3KMx79U/U71XRtvloiZF1ef0XUNvDZ/2DdTNWavdJzVeDq+whD0/ThvP0LsJzzCQ
-cgfRUljfxtWHOYVqHspfFg03ofDODodzq+yT5ElIQNWL71fRQ5lX8cPAVrX6v3Rs
-h2tBsWV3xjMscG36E7nKbgSXWxDInr4Xw056Mx/JO6If8vnCOYOhXcv3fdZ5Lqpr
-qr6uniBTcRi1q97JI1+KDoHU6MfJ7I17wU/bTPFgy6Yck4Ropmwd5dvbwRVTdQHx
-n08XYEZyNdq8zskbj8MI83jvDdvdd7b95SiBO6X3qIYKebk8rg1CfYFxBIyRd2ll
-yt1K0ow4M54woB/68cMy0UB6cA8uOHscRObau3T3UB0ohsEPF7KYAqOKfKP0irV+
-Ys6tR0KI/TeHqrqKhCA9PGOpOmqJaibt5GqFTc3Dp4U19njMmh4eboki8EwS6DNy
-4HD76dFz2jkSQ74uB/X+nxuFEVRKS54q4aeg83NL5lnsD8TWdhTui4mURQARAQAB
-tDxQb3dlckROUyBSZWxlYXNlIFNpZ25pbmcgS2V5IDxwb3dlcmRucy5zdXBwb3J0
-QHBvd2VyZG5zLmNvbT6JAj4EEwECACgFAlV2/GwCGwMFCQ8JnAAGCwkIBwMCBhUI
-AgkKCwQWAgMBAh4BAheAAAoJEBsMYgX9OA+75QYQAJ7a3rZiTmBJkYfDYbZGOcJj
-tIgWj5ieyIHjaG1kR3setK1GbYrd7dkeHuWIT8FCO/mQwrKTlxEd+Vj5a79Bpu0D
-de1MRi7jTIb/Qrge532Pnk5T7qFjJWfvTWhpSV9XDwHR216aByuHZ9gAJt92hgo5
-eSXHPpwbi+qAdymndUswFBHY0kLNpIYAa2mZcSNbaI/RFNYPOM/aqDMcpQ2s1Rf1
-c8iTPewf04jlNd75M59AAbnpdoFiCKbV+Q8oeUNxRGhHCQgcTaWhT5vdF2pXP1jb
-rVykPxN7U5zTu03m/qbUCKg9Pqkhr79a2XNIpcGHhsp58B6dJdBPhXT/tFXnVpY0
-wZHGGlBVhZzC1Qdq58ilyQ2qfIci2sjMoS62lAffemb88CyoQ2UadhNKZTn93Ogo
-lmW1txqN7UU7hUBxwdztw+Pgf7V+ADwkPHnSsNLupkZ7QUOl2i1kPwgcnwHLPFoD
-bYDteCtqcVVCY5v3OC95jGJ4bqwgIIeQ5kloKY2pRLeNedbCHbGc6rVjX5X0K2zt
-F7/dWOklI1Ox4Y+Vv0Ln7u3BvSyl5jWXWzH2V6q3ff7NKVro3keZmgTzcBwJEv/z
-p40ds9f2LTKJX4DajyAF2Z+j79obMYwKo0w+Vy36QrO8TlKk+ZU/6vcFfVdEoCtv
-d5a03QgyYgMX0WW8Smam
-=BY4B
------END PGP PUBLIC KEY BLOCK-----
diff --git a/data/live-build-config/archives/pdns.pref.chroot b/data/live-build-config/archives/pdns.pref.chroot
deleted file mode 100644
index 24d2beae..00000000
--- a/data/live-build-config/archives/pdns.pref.chroot
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: pdns-*
-Pin: origin repo.powerdns.com
-Pin-Priority: 600