From 679747704af6b13081341163e7e32ddb9746b7b1 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Thu, 11 Jan 2018 06:51:58 +0100 Subject: T519: fix paths and operation order in the makefile for correct repo setup. --- Makefile | 3 ++- scripts/live-build-config | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8aa082ce..2eaed429 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,9 @@ prepare: @echo "Starting VyOS ISO image build" rm -rf build/config/* - @scripts/live-build-config + mkdir -p build/config cp -r data/live-build-config/* build/config/ + @scripts/live-build-config @scripts/import-local-packages @scripts/make-version-file diff --git a/scripts/live-build-config b/scripts/live-build-config index 544c67e8..4b491aeb 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -66,7 +66,7 @@ debug = build_config['debug'] print("Setting up additional APT entries") 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: print("Adding these entries to {0}:".format(apt_file)) -- cgit v1.2.3