vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

T519: fix paths and operation order in the makefile for correct repo setup.

Browse Source
This commit is contained in:
Daniil Baturin 2018-01-11 06:51:58 +01:00
parent 920344fe59
commit 679747704a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -15,8 +15,9 @@ prepare:
@echo "Starting VyOS ISO image build" @echo "Starting VyOS ISO image build"
rm -rf build/config/* rm -rf build/config/*
@scripts/live-build-config mkdir -p build/config
cp -r data/live-build-config/* build/config/ cp -r data/live-build-config/* build/config/
@scripts/live-build-config
@scripts/import-local-packages @scripts/import-local-packages
@scripts/make-version-file @scripts/make-version-file

2
scripts/live-build-config
View File

@ -66,7 +66,7 @@ debug = build_config['debug']
print("Setting up additional APT entries") 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} {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch'])
apt_file = os.path.join(defaults.BUILD_DIR, defaults.VYOS_REPO_FILE) apt_file = os.path.join(build_config['build_dir'], defaults.VYOS_REPO_FILE)
if debug: if debug:
print("Adding these entries to {0}:".format(apt_file)) print("Adding these entries to {0}:".format(apt_file))