mirror of
https://github.com/vyos/vyos-build.git
synced 2025-10-01 20:28:40 +02:00
[build] Use pdns-recursor binary packages from PowerDNS
https://repo.powerdns.com/ provides a package repository for Debian 8 which serves us automatically all security updates instead of rebuilding the package by us. This drops the maintenance of one additional package. (cherry picked from commit dec0a52554c8bf8e87a0ac4dba7d7ae357672e6e)
This commit is contained in:
parent
b7db9d121a
commit
22d82d60b1
30
data/live-build-config/archives/pdns.key.chroot
Normal file
30
data/live-build-config/archives/pdns.key.chroot
Normal file
@ -0,0 +1,30 @@
|
||||
-----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-----
|
||||
@ -59,6 +59,7 @@ options = {
|
||||
'pbuilder-debian-mirror': ('Debian repository mirror for pbuilder env bootstrap', lambda: defaults.DEBIAN_MIRROR, None),
|
||||
'salt-mirror': ('Salt package mirror', lambda: defaults.SALT_MIRROR, None),
|
||||
'vyos-mirror': ('VyOS package mirror', lambda: defaults.VYOS_MIRROR, None),
|
||||
'pdns-mirror': ('PowerDNS package mirror', lambda: defaults.PDNS_MIRROR, None),
|
||||
'build-type': ('Build type, release or development', lambda: 'development', lambda x: x in ['release', 'development']),
|
||||
'custom-packages': ('Custom packages to install from repositories', lambda: '', None),
|
||||
'version': ('Version number (release builds only)', None, None)
|
||||
|
||||
@ -28,6 +28,7 @@ DEBIAN_SECURITY_MIRROR = 'http://ftp.nl.debian.org/debian-security'
|
||||
DEBIAN_DISTRIBUTION = 'jessie'
|
||||
|
||||
SALT_MIRROR = 'http://repo.saltstack.com/apt/debian/8/amd64/2017.7'
|
||||
PDNS_MIRROR = 'http://repo.powerdns.com/debian'
|
||||
|
||||
PBUILDER_CONFIG = os.path.join(BUILD_DIR, 'pbuilderrc')
|
||||
PBUILDER_DIR = os.path.join(BUILD_DIR, 'pbuilder')
|
||||
|
||||
@ -71,6 +71,7 @@ print("Setting up additional APT entries")
|
||||
vyos_repo_entry = "deb {0}/vyos {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch'])
|
||||
#vyos_debian_repo_entry = "deb {0}/debian {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch'])
|
||||
salt_repo_entry = "deb {0} {1} main\n".format(build_config['salt_mirror'], build_config['distribution'])
|
||||
pdns_repo_entry = "deb {0} {1}-rec-41 main\n".format(build_config['pdns_mirror'], build_config['distribution'])
|
||||
|
||||
apt_file = os.path.join(build_config['build_dir'], defaults.VYOS_REPO_FILE)
|
||||
|
||||
@ -79,11 +80,13 @@ if debug:
|
||||
print("\t", vyos_repo_entry)
|
||||
# print("\t", vyos_debian_repo_entry)
|
||||
print("\t", salt_repo_entry)
|
||||
print("\t", pdns_repo_entry)
|
||||
|
||||
with open(apt_file, 'w') as f:
|
||||
f.write(vyos_repo_entry)
|
||||
# f.write(vyos_debian_repo_entry)
|
||||
f.write(salt_repo_entry)
|
||||
f.write(pdns_repo_entry)
|
||||
|
||||
# Add custom APT entries
|
||||
if build_config['custom_apt_entry']:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user