diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-05-20 10:04:31 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-05-20 10:04:31 +0200 |
| commit | 17de291859b87bfb7d477adbe1a40d19f3f61ae0 (patch) | |
| tree | 50eeab304dde933441bf06af7bf3f6c8739c4118 | |
| parent | ad61428195b6c9a976132940ea375c212e78e8ab (diff) | |
| download | vyos-build-17de291859b87bfb7d477adbe1a40d19f3f61ae0.tar.gz vyos-build-17de291859b87bfb7d477adbe1a40d19f3f61ae0.zip | |
T561: split vyos and debian repos.
| -rw-r--r-- | scripts/defaults.py | 2 | ||||
| -rwxr-xr-x | scripts/live-build-config | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/defaults.py b/scripts/defaults.py index bb6f0910..93eadc30 100644 --- a/scripts/defaults.py +++ b/scripts/defaults.py @@ -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' diff --git a/scripts/live-build-config b/scripts/live-build-config index 5814bf89..b1a77b4c 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -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 |