summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-vyos-image4
-rw-r--r--scripts/vyos_build_defaults.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/build-vyos-image b/scripts/build-vyos-image
index 3d387a15..5d0248a0 100755
--- a/scripts/build-vyos-image
+++ b/scripts/build-vyos-image
@@ -460,7 +460,7 @@ Pin: release n={build_config['release_train']}
Pin-Priority: 600
"""
- with open(f'../data/live-build-config/archives/vyos.pref.chroot', 'w') as f:
+ with open(defaults.VYOS_PIN_FILE, 'w') as f:
f.write(apt_pin)
print("I: Configuring live-build")
@@ -483,7 +483,7 @@ Pin-Priority: 600
local_packages = glob.glob('../packages/*.deb')
if local_packages:
for f in local_packages:
- shutil.copy(f, 'config/packages.chroot/' + os.path.basename(f))
+ shutil.copy(f, os.path.join(defaults.LOCAL_PACKAGES_PATH, os.path.basename(f)))
## Build the image
print("I: Starting image build")
diff --git a/scripts/vyos_build_defaults.py b/scripts/vyos_build_defaults.py
index ac82dbc4..975fcb71 100644
--- a/scripts/vyos_build_defaults.py
+++ b/scripts/vyos_build_defaults.py
@@ -40,6 +40,8 @@ CHROOT_INCLUDES_DIR = 'config/includes.chroot'
ARCHIVES_DIR = 'config/archives/'
VYOS_REPO_FILE = 'config/archives/vyos.list.chroot'
+VYOS_PIN_FILE = 'config/archives/release.pref.chroot'
CUSTOM_REPO_FILE = 'config/archives/custom.list.chroot'
PACKAGE_LIST_FILE = 'config/package-lists/custom.list.chroot'
+LOCAL_PACKAGES_PATH = 'config/packages.chroot/'