summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-04-25 16:18:14 +0200
committerChristian Poessinger <christian@poessinger.com>2019-04-25 16:18:14 +0200
commit7492e273834b4aa01712b16d8229fd9f91019c89 (patch)
tree2d0b5d78998b1988a4fcf6f91ebbbc9c4e5f16bc
parentec609b409a74b0f531b1eba43bb09e22db76ee10 (diff)
downloadvyos-build-7492e273834b4aa01712b16d8229fd9f91019c89.tar.gz
vyos-build-7492e273834b4aa01712b16d8229fd9f91019c89.zip
VyOS 1.3.0 is based on Debian Buster
-rw-r--r--data/defaults.json8
-rw-r--r--data/versions2
-rwxr-xr-xscripts/live-build-config5
3 files changed, 5 insertions, 10 deletions
diff --git a/data/defaults.json b/data/defaults.json
index 2699b789..bddc75f1 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -2,15 +2,11 @@
"architecture": "amd64",
"debian_mirror": "http://deb.debian.org/debian",
"debian_security_mirror": "http://deb.debian.org/debian-security",
- "debian_distribution": "jessie",
+ "debian_distribution": "buster",
"vyos_mirror": "http://dev.packages.vyos.net/repositories/current",
"vyos_branch": "current",
"kernel_version": "4.19.36",
"kernel_flavor": "amd64-vyos",
- "additional_repositories": [
- "deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main",
- "deb http://repo.powerdns.com/debian jessie-rec-41 main",
- "deb http://archive.debian.org/debian/ jessie-backports main"
- ],
+ "additional_repositories": [],
"custom_packages": []
}
diff --git a/data/versions b/data/versions
index 3d0c2871..6b068aa7 100644
--- a/data/versions
+++ b/data/versions
@@ -1,3 +1,3 @@
{
- "current": "1.2.0"
+ "current": "1.3.0"
}
diff --git a/scripts/live-build-config b/scripts/live-build-config
index 9b7c2d67..05a41bd4 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -45,7 +45,7 @@ lb config noauto \
--iso-application "VyOS" \
--iso-publisher "{{build_by}}" \
--iso-volume "VyOS" \
- --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-transport-https" \
+ --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-transport-https,gnupg2" \
--mirror-bootstrap {{debian_mirror}} \
--mirror-chroot {{debian_mirror}} \
--mirror-chroot-security {{debian_security_mirror}} \
@@ -54,9 +54,8 @@ lb config noauto \
--archive-areas "main contrib non-free" \
--firmware-chroot false \
--firmware-binary false \
- --updates false \
+ --updates true \
--security true \
- --apt-options "--yes -oAcquire::Check-Valid-Until=false" \
--apt-indices false
"${@}"
"""