diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-03-10 21:03:09 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-03-10 21:03:09 +0100 |
commit | dec0a52554c8bf8e87a0ac4dba7d7ae357672e6e (patch) | |
tree | aee73883daf4d20f5c210ff7081ab25a0fff4990 /scripts | |
parent | 48bcbfff70c0e7629f7ece72f59aec3c67e8efb4 (diff) | |
download | vyos-build-dec0a52554c8bf8e87a0ac4dba7d7ae357672e6e.tar.gz vyos-build-dec0a52554c8bf8e87a0ac4dba7d7ae357672e6e.zip |
[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.
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build-config | 1 | ||||
-rw-r--r-- | scripts/defaults.py | 1 | ||||
-rwxr-xr-x | scripts/live-build-config | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/scripts/build-config b/scripts/build-config index db870be7..ce83f74e 100755 --- a/scripts/build-config +++ b/scripts/build-config @@ -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) diff --git a/scripts/defaults.py b/scripts/defaults.py index 73a8d459..5f1941c1 100644 --- a/scripts/defaults.py +++ b/scripts/defaults.py @@ -28,6 +28,7 @@ DEBIAN_SECURITY_MIRROR = 'http://deb.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') diff --git a/scripts/live-build-config b/scripts/live-build-config index ad559559..1aea4dc5 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -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']: |