T561: split vyos and debian repos.

This commit is contained in:
Daniil Baturin 2018-05-20 10:04:31 +02:00
parent ad61428195
commit 17de291859
2 changed files with 5 additions and 2 deletions

View File

@ -33,7 +33,7 @@ PBUILDER_DIR = os.path.join(BUILD_DIR, 'pbuilder')
LB_CONFIG_DIR = os.path.join(BUILD_DIR, 'config')
CHROOT_INCLUDES_DIR = os.path.join(LB_CONFIG_DIR, 'includes.chroot')
VYOS_MIRROR = 'http://dev.packages.vyos.net/repositories/current/vyos'
VYOS_MIRROR = 'http://dev.packages.vyos.net/repositories/current'
VYOS_BRANCH = 'current'

View File

@ -65,16 +65,19 @@ debug = build_config['debug']
# Add the additional repositories to package lists
print("Setting up additional APT entries")
vyos_repo_entry = "deb {0} {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch'])
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'])
apt_file = os.path.join(build_config['build_dir'], defaults.VYOS_REPO_FILE)
if debug:
print("Adding these entries to {0}:".format(apt_file))
print("\t", vyos_repo_entry)
print("\t", vyos_debian_repo_entry)
with open(apt_file, 'w') as f:
f.write(vyos_repo_entry)
f.write(vyos_debian_repo_entry)
# Configure live-build