diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | data/live-build-config/archives/vyos.list.chroot | 1 | ||||
| -rw-r--r-- | scripts/defaults.py | 1 | ||||
| -rwxr-xr-x | scripts/import-local-packages | 6 | ||||
| -rwxr-xr-x | scripts/live-build-config | 4 |
5 files changed, 11 insertions, 2 deletions
@@ -16,6 +16,7 @@ prepare: rm -rf build/config/* @scripts/live-build-config cp -r data/live-build-config/* build/config/ + @scripts/import-local-packages @scripts/make-version-file diff --git a/data/live-build-config/archives/vyos.list.chroot b/data/live-build-config/archives/vyos.list.chroot index 664b408c..2b117386 100644 --- a/data/live-build-config/archives/vyos.list.chroot +++ b/data/live-build-config/archives/vyos.list.chroot @@ -1,2 +1 @@ deb http://dev.packages.vyos.net/vyos current main -deb http://security.debian.org/ jessie/updates main diff --git a/scripts/defaults.py b/scripts/defaults.py index b9a3f255..0792d6b2 100644 --- a/scripts/defaults.py +++ b/scripts/defaults.py @@ -23,6 +23,7 @@ BUILD_CONFIG = os.path.join(BUILD_DIR, 'build-config.json') # The default mirror was chosen entirely at random DEBIAN_MIRROR = 'http://ftp.nl.debian.org/debian/' +DEBIAN_SECURITY_MIRROR = 'http://security.debian.org/' DEBIAN_DISTRIBUTION = 'jessie' diff --git a/scripts/import-local-packages b/scripts/import-local-packages new file mode 100755 index 00000000..be8e1688 --- /dev/null +++ b/scripts/import-local-packages @@ -0,0 +1,6 @@ +#!/bin/sh + +LOCAL_PKG_DIR=build/config/packages.chroot + +mkdir -p $LOCAL_PKG_DIR +cp packages/*.deb $LOCAL_PKG_DIR diff --git a/scripts/live-build-config b/scripts/live-build-config index 7c51744c..cb9e84dc 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -49,7 +49,9 @@ lb config noauto \ --mirror-chroot {{debian_mirror}} \ --mirror-chroot-security {{debian_mirror}} \ --mirror-binary {{debian_mirror}} \ - --mirror-binary-security {{debian_mirror}} + --mirror-binary-security {{debian_security_mirror}} \ + --archive-areas "main contrib non-free" \ + --firmware-chroot true "${@}" """ |