From 7492e273834b4aa01712b16d8229fd9f91019c89 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 25 Apr 2019 16:18:14 +0200 Subject: VyOS 1.3.0 is based on Debian Buster --- scripts/live-build-config | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'scripts') 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 "${@}" """ -- cgit v1.2.3 From 0df7365a73596261a1136e6142e6b918a037ec81 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:57:14 +0200 Subject: Packages: favour Debian Buster version of 'xl2tpd' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index cff676ed..372acb3c 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -184,7 +184,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-biosdevname', 'vyos-opennhrp', 'vyos-salt-minion', - 'xl2tpd', 'mdns-repeater', 'udp-broadcast-relay', 'pmacct', -- cgit v1.2.3 From 1ae054ecfc4521235c5b912864d430a33a5f3238 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:57:44 +0200 Subject: Packages: favour Debian Buster version of 'igmpproxy' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index 372acb3c..c38d331d 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -188,7 +188,6 @@ vyos_packages = ['vyatta-bash', 'udp-broadcast-relay', 'pmacct', 'ddclient', - 'igmpproxy', 'eventwatchd', 'conntrack-tools'] -- cgit v1.2.3 From 9679c120c18e5681084d80011aa4882037bc824c Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:58:13 +0200 Subject: Packages: favour Debian Buster version of 'pmacct' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index c38d331d..f8220689 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -186,7 +186,6 @@ vyos_packages = ['vyatta-bash', 'vyos-salt-minion', 'mdns-repeater', 'udp-broadcast-relay', - 'pmacct', 'ddclient', 'eventwatchd', 'conntrack-tools'] -- cgit v1.2.3 From 6455ecb9fdf07a0d559592a0f6cdfe88198cb3b5 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:58:31 +0200 Subject: Packages: favour Debian Buster version of 'ddclient' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index f8220689..9378ea85 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -186,7 +186,6 @@ vyos_packages = ['vyatta-bash', 'vyos-salt-minion', 'mdns-repeater', 'udp-broadcast-relay', - 'ddclient', 'eventwatchd', 'conntrack-tools'] -- cgit v1.2.3 From 21e6775dbc86f6025e42677d105c788eddaeb1d7 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:59:36 +0200 Subject: Packages: favour Debian Buster version of 'lldpd' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index 9378ea85..22565e62 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -201,7 +201,6 @@ pkg_special.append( add_package('ipaddrcheck', branch='master')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -pkg_special.append( add_package('lldpd', url='https://github.com/vincentbernat/lldpd.git', branch='master', tag='1.0.3') ) pkg_special.append( add_package('ethtool', url='https://salsa.debian.org/kernel-team/ethtool.git', branch='master', tag='debian/1%4.19-1') ) pkg_special.append( add_package('bgpq3', url='https://salsa.debian.org/debian/bgpq3.git', branch='master', tag='debian/0.1.33-1') ) -- cgit v1.2.3 From 86670e60bf70a6640e7a610baa4469ab74afc83a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:59:53 +0200 Subject: Packages: favour Debian Buster version of 'ethtool' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index 22565e62..864e7da9 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -201,7 +201,6 @@ pkg_special.append( add_package('ipaddrcheck', branch='master')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -pkg_special.append( add_package('ethtool', url='https://salsa.debian.org/kernel-team/ethtool.git', branch='master', tag='debian/1%4.19-1') ) pkg_special.append( add_package('bgpq3', url='https://salsa.debian.org/debian/bgpq3.git', branch='master', tag='debian/0.1.33-1') ) # VyOS strongswan ships additional python3-vici packages required by vyos-1x and this is not build by default -- cgit v1.2.3 From 7f0cd5969988f10bd6dbfd64ed066966722578a6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 May 2019 00:00:09 +0200 Subject: Packages: favour Debian Buster version of 'bgpq3' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index 864e7da9..55f8b369 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -201,7 +201,6 @@ pkg_special.append( add_package('ipaddrcheck', branch='master')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -pkg_special.append( add_package('bgpq3', url='https://salsa.debian.org/debian/bgpq3.git', branch='master', tag='debian/0.1.33-1') ) # VyOS strongswan ships additional python3-vici packages required by vyos-1x and this is not build by default vyos_strongswan_build_cmd = "dpkg-buildpackage -b -us -uc -tc && " \ -- cgit v1.2.3 From 15de1a9b8d4f57d05d9848b8fa8cc96dd061b77e Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 May 2019 00:01:18 +0200 Subject: Packages: use 'equuleus' branch of 'vyos-1x' --- scripts/build-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index 55f8b369..8a6fb46d 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -176,7 +176,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-ravpn', 'vyos-nhrp', 'vyos-world', - 'vyos-1x', 'vyatta-iproute', 'vyos-vmwaretools-scripts', 'vyos-netplug', @@ -198,6 +197,7 @@ libvyosconfig_build_cmd = "eval $(opam env --root=/opt/opam --set-root) && " \ "dpkg-buildpackage -b -us -uc -tc" pkg_special.append( add_package('libvyosconfig', branch='master', custombuild_cmd=libvyosconfig_build_cmd)) pkg_special.append( add_package('ipaddrcheck', branch='master')) +pkg_special.append( add_package('vyos-1x', branch='equuleus')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -- cgit v1.2.3 From 8a2922799c50764744f1c0be1548afb5b73a5f94 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 May 2019 00:08:55 +0200 Subject: Packages: use 'equuleus' branch for 'vyatta-conntrack*' --- scripts/build-packages | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index 8a6fb46d..a0e329b7 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -155,8 +155,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-op-qos', 'vyatta-cfg-op-pppoe', 'vyatta-openvpn', - 'vyatta-conntrack', - 'vyatta-conntrack-sync', 'vyatta-nat', 'vyatta-config-mgmt', 'vyatta-config-migrate', @@ -185,8 +183,7 @@ vyos_packages = ['vyatta-bash', 'vyos-salt-minion', 'mdns-repeater', 'udp-broadcast-relay', - 'eventwatchd', - 'conntrack-tools'] + 'eventwatchd'] # Special packages mean packages which are located no in the VyOS namespace # or require fancy build instructions @@ -198,6 +195,8 @@ libvyosconfig_build_cmd = "eval $(opam env --root=/opt/opam --set-root) && " \ pkg_special.append( add_package('libvyosconfig', branch='master', custombuild_cmd=libvyosconfig_build_cmd)) pkg_special.append( add_package('ipaddrcheck', branch='master')) pkg_special.append( add_package('vyos-1x', branch='equuleus')) +pkg_special.append( add_package('vyatta-conntrack', branch='equuleus')) +pkg_special.append( add_package('vyatta-conntrack-sync', branch='equuleus')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -- cgit v1.2.3 From b889549e517953a8ce208389d5b485dadd1af387 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 May 2019 00:09:01 +0200 Subject: intel: remove dependency on linux-image --- scripts/build-intel-drivers | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build-intel-drivers b/scripts/build-intel-drivers index ef039e4c..2c5882bb 100755 --- a/scripts/build-intel-drivers +++ b/scripts/build-intel-drivers @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash basedir=$(pwd) if [ -z "$KSRC" ]; then @@ -67,7 +67,6 @@ do echo "Architecture: amd64" >>$deb_pkg_dir/DEBIAN/control echo "Maintainer: VyOS Package Maintainers " >>$deb_pkg_dir/DEBIAN/control echo "Installed-Size: 9" >>$deb_pkg_dir/DEBIAN/control - echo "Depends: linux-image" >>$deb_pkg_dir/DEBIAN/control echo "Description: Intel Vendor driver for $dirname" >>$deb_pkg_dir/DEBIAN/control echo " Replacement for the in Kernel drivers" >>$deb_pkg_dir/DEBIAN/control -- cgit v1.2.3 From e9d561ad537ebaa0d5eba5e6413ee1428141bf4a Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Tue, 28 May 2019 23:01:55 +0200 Subject: Update kernel arguments, enable isolinux serial and disable systemd ifnames * The kernel is now sending console to ttyS0, this makes debugging with `qemu -nographic` hard, this is fixed by this commit * Buster activates systemd ifname'ing, this needs to be disabled to make our naming scheme work --- scripts/live-build-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/live-build-config b/scripts/live-build-config index 05a41bd4..7141df00 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -35,7 +35,7 @@ util.check_build_config() lb_config_tmpl = """ lb config noauto \ --architectures {{architecture}} \ - --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay" \ + --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" \ --linux-flavours {{kernel_flavor}} \ --linux-packages linux-image-{{kernel_version}} \ --bootloader syslinux,grub-efi \ -- cgit v1.2.3 From 3da6afd6a521ee1d55607a4a015be1696ea9ff0a Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 20 Jun 2019 09:39:35 +0200 Subject: T1413: T1412: compilation of netplug and xe-guest-utilities is now fixed in equuleus --- data/package-lists/vyos-x86.list.chroot | 2 ++ scripts/build-packages | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot index e107534c..8e2b8692 100644 --- a/data/package-lists/vyos-x86.list.chroot +++ b/data/package-lists/vyos-x86.list.chroot @@ -2,3 +2,5 @@ grub2 grub-pc qemu-guest-agent hyperv-daemons +vyos-netplug +vyos-xe-guest-utilities diff --git a/scripts/build-packages b/scripts/build-packages index 2d33708f..9d94ca12 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -177,8 +177,6 @@ vyos_packages = ['vyatta-bash', 'vyos-world', 'vyatta-iproute', 'vyos-vmwaretools-scripts', - 'vyos-netplug', - 'vyos-xe-guest-utilities', 'vyatta-biosdevname', 'vyos-opennhrp', 'vyos-salt-minion', @@ -198,6 +196,8 @@ pkg_special.append( add_package('ipaddrcheck', branch='master')) pkg_special.append( add_package('vyos-1x', branch='equuleus')) pkg_special.append( add_package('vyatta-conntrack', branch='equuleus')) pkg_special.append( add_package('vyatta-conntrack-sync', branch='equuleus')) +pkg_special.append( add_package('vyos-xe-guest-utilities', branch='equuleus')) +pkg_special.append( add_package('vyos-netplug', branch='equuleus')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -- cgit v1.2.3 From 7ac3f58540df9749ec71a2fd17d4f4c8257ff801 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 20 Jul 2019 20:30:40 +0200 Subject: Packages: default to equuleus branch --- scripts/build-packages | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index 9d94ca12..d694b8bb 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -11,7 +11,7 @@ current_working_directory = os.getcwd() repo_root = subprocess.check_output('git rev-parse --show-toplevel', shell=True, universal_newlines=True).rstrip('\n') repo_sha = subprocess.check_output('git rev-parse --short=12 HEAD', shell=True, universal_newlines=True).rstrip('\n') -def add_package(name, url=None, commit='HEAD', branch='current', tag=None, custombuild_cmd=None): +def add_package(name, url=None, commit='HEAD', branch='equuleus', tag=None, custombuild_cmd=None): """ Build up source package with URL and build commands executed during the later called build_package step. @@ -182,6 +182,11 @@ vyos_packages = ['vyatta-bash', 'vyos-salt-minion', 'mdns-repeater', 'udp-broadcast-relay', + 'vyos-1x', + 'vyatta-conntrack', + 'vyatta-conntrack-sync', + 'vyos-xe-guest-utilities', + 'vyos-netplug', 'eventwatchd'] # Special packages mean packages which are located no in the VyOS namespace @@ -193,11 +198,6 @@ libvyosconfig_build_cmd = "eval $(opam env --root=/opt/opam --set-root) && " \ "dpkg-buildpackage -b -us -uc -tc" pkg_special.append( add_package('libvyosconfig', branch='master', custombuild_cmd=libvyosconfig_build_cmd)) pkg_special.append( add_package('ipaddrcheck', branch='master')) -pkg_special.append( add_package('vyos-1x', branch='equuleus')) -pkg_special.append( add_package('vyatta-conntrack', branch='equuleus')) -pkg_special.append( add_package('vyatta-conntrack-sync', branch='equuleus')) -pkg_special.append( add_package('vyos-xe-guest-utilities', branch='equuleus')) -pkg_special.append( add_package('vyos-netplug', branch='equuleus')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -- cgit v1.2.3 From b229f0bd958a42c6faa345c91500c2ed8ccdc919 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 20 Jul 2019 21:20:30 +0200 Subject: Packages: remove vyatta-op-dhcp-server --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index d694b8bb..c57dd822 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -164,7 +164,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-webproxy', 'vyatta-cfg-quagga', 'vyatta-op-quagga', - 'vyatta-op-dhcp-server', 'vyatta-wireless', 'vyatta-wirelessmodem', 'vyatta-wanloadbalance', -- cgit v1.2.3 From 3c9071dcc1ed48cbbcae26d967eaef8763210482 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Tue, 30 Jul 2019 09:03:37 -0400 Subject: Adjustments for the new equuleus repository. --- data/defaults.json | 4 +- .../live-build-config/archives/vyos-dev.key.chroot | 77 +++++++++++------ .../archives/vyos-release.key.chroot | 99 +++++++++++----------- scripts/live-build-config | 5 +- 4 files changed, 102 insertions(+), 83 deletions(-) (limited to 'scripts') diff --git a/data/defaults.json b/data/defaults.json index 5e6515d9..964e5da9 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -3,8 +3,8 @@ "debian_mirror": "http://deb.debian.org/debian", "debian_security_mirror": "http://deb.debian.org/debian-security", "debian_distribution": "buster", - "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", - "vyos_branch": "current", + "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", + "vyos_branch": "equuleus", "kernel_version": "4.19.54", "kernel_flavor": "amd64-vyos", "additional_repositories": [], diff --git a/data/live-build-config/archives/vyos-dev.key.chroot b/data/live-build-config/archives/vyos-dev.key.chroot index a6522e36..9f306a91 100644 --- a/data/live-build-config/archives/vyos-dev.key.chroot +++ b/data/live-build-config/archives/vyos-dev.key.chroot @@ -1,32 +1,53 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -mQENBFOQPGwBCADjm8Oq3kaJQh0rI33XVfd9mNq5ffay884SlDCbG1hkLVf8tnGV -cjH7/nFfJdW/6Gr4dj4LQuHHnin5QeWnlHfuOySlOEsJCNP5dm14oEjy7epSXOv2 -A3m2tPDDqwMgfrOyw1gN+Clit9QIujiRzbcakqearyNxcVNvinIVunNiWbAyIhvc -uI6yfMjno4q/O83c7e1zBqJj9t9guQjBuqaJrmZVf985/6ue9yWzSI4JtzxVmhKI -dfCxHWE7BiEt2hnZPSVGcb4q6cBrkpcra7Ny55eoyN51wQGokPv3a9/8b3r5speR -gene2MTvD/3eZOtTvMN000f/gJX4E6o8xx+fABEBAAG0R1Z5T1MgTWFpbnRhaW5l -cnMgKERldmVsb3BtZW50IGFuZCB0ZXN0aW5nIHJlcG9zKSA8bWFpbnRhaW5lcnNA -dnlvcy5uZXQ+iQE4BBMBAgAiBQJTkDxsAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe -AQIXgAAKCRAywkm9DfBLXJbHB/4xlwn+6cZGEWWNZgXwUTMeHubZItl1o3Tbrzaa -E3EqYyHJMYb3gBLOomlw7JLw5qT/247tlPC8ricl+BpeE5vYA3a08mIpcymROFh6 -pKJLNvdZHjrVN9yH2xYifI5sIDyuPga8Bgq/BMRiB1ragS/on2aUs75+tsEI32NI -JO8+jIav0Nd6n/Wmw55ioTXS3fx6VDb64D80luOf1ve5LFDs8Oz2I+ZjSf7mPMY/ -b9qQHNb/300k/tIeK2F4G7LFu6o/1YMlrv0Ry7j9BsLzIkmTh0pX4mSVvF6IrxsZ -WJRKu3uQDH2qccjptZDq4jHo/ow+aWT8rakjOgL9nJgKD5u/uQENBFOQPGwBCAC0 -zHpsmcfUIDyflGL+vwHV/3L02/vItHXfIkugL+wFB9C9i6nWA1KqNJwqNflJLGQF -y+vHXs0oa3oMKj7S3p2zTbuU8s9Vz2Cg5c15sy7yGjh/LTwVOR5ZJrgbRJxTTp9K -j5bkrx/DbDjIQ5szyjZ5N1ZAUyUx5Z/xMB3mTnLxDASvaoq+/F6WNcYY7NzjI7M0 -SFtnZLj6MFUVTmSbyYdGQc/Cxu5Utl7WKJUqHW5z10vJruZsdKV2+vf98yqhAJ+v -wPhKUoVD+KtCH/CrHFrVq0hCKIMtyPLtaTeR/QnCNDEsV4p82HB9KQOYEADEL3/A -a7Dntf3Xi+5eO/3MlnshABEBAAGJAR8EGAECAAkFAlOQPGwCGwwACgkQMsJJvQ3w -S1z+wwf9GnVn9GhbB1FhKQdavljp9rUzz8FvH3tRpftdhhJ8B0PVAMl4QRcIXrgD -nyd1K9ggzyWa4Z/9PygvH0Njv4YWlZh900wei9uVD8am1ncgQ/Jqlb36WvXyr8W/ -VPzQDtKAOkUz6RhKQ4V6I0PBK9nGeqeFkeH1bF1uGXkKpa0hGWffyOT1VasaZVXT -UN4VAYNzBwkoU0mIYK73CPi7e4YJrtOp/i8MGDL3pxKaZEEZJdc4/dZassqBuwSG -MRr2kecj9f53KWI0jLQdLgTMJQxscotfzhsWoF/842sUCbezwV3/4FtBhlNeqUHA -c9HOeh3wbjjt4uONvxeleE+jM9v63Q== -=gflA +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 +FhyPysWJ4aNKtAYgVuQguPTt +=rJUC -----END PGP PUBLIC KEY BLOCK----- diff --git a/data/live-build-config/archives/vyos-release.key.chroot b/data/live-build-config/archives/vyos-release.key.chroot index ff47c683..9f306a91 100644 --- a/data/live-build-config/archives/vyos-release.key.chroot +++ b/data/live-build-config/archives/vyos-release.key.chroot @@ -1,52 +1,53 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -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 -8vzPzaWHhkOkU8/J/Ci7+vNtUOZb -=Ld8S +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 +FhyPysWJ4aNKtAYgVuQguPTt +=rJUC -----END PGP PUBLIC KEY BLOCK----- + diff --git a/scripts/live-build-config b/scripts/live-build-config index 9855467d..7a253557 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -68,19 +68,16 @@ debug = build_config['debug'] # Add the additional repositories to package lists print("Setting up additional APT entries") -vyos_repo_entry = "deb {0}/vyos {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch']) -vyos_debian_repo_entry = "deb {0}/debian {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(build_config['build_dir'], defaults.VYOS_REPO_FILE) if debug: print("Adding these entries to {0}:".format(apt_file)) print("\t", vyos_repo_entry) - print("\t", vyos_debian_repo_entry) with open(apt_file, 'w') as f: f.write(vyos_repo_entry) - f.write(vyos_debian_repo_entry) # Add custom APT entries if build_config['custom_apt_entry']: -- cgit v1.2.3 From b8be8d281587cbed6f5fbf5133c4d7cc1951ea6b Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 17 Aug 2019 02:26:41 +0200 Subject: Packages: remove obsolete vyatta-openvpn --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/build-packages b/scripts/build-packages index 5abd1ea6..8d1447dd 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -157,7 +157,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-cfg-qos', 'vyatta-op-qos', 'vyatta-cfg-op-pppoe', - 'vyatta-openvpn', 'vyatta-nat', 'vyatta-config-mgmt', 'vyatta-config-migrate', -- cgit v1.2.3 From 29dc679dd04deb5f37fb6e94bde5295cfeb8e220 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 21 Aug 2019 11:39:19 -0500 Subject: T1602: add options to default to vyos packages over debian --- scripts/live-build-config | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/live-build-config b/scripts/live-build-config index 7a253557..171b827d 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -57,6 +57,7 @@ lb config noauto \ --firmware-binary false \ --updates true \ --security true \ + --apt-options "--yes -oAPT::Default-Release="equuleus" -oAPT::Get::allow-downgrades=true" \ --apt-indices false "${@}" """ -- cgit v1.2.3 From 3258d73399c8426c5c28711b93e87c4f6c8f89de Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Mon, 23 Sep 2019 21:33:58 +0200 Subject: Add script to check installation iso with qemu This script installs a system on a emulated qemu host to verify that the iso produced is installable and boots. After the iso is booted from disk it also tries to execute the vyos-smoketest script to verify checks there. --- scripts/check-qemu-install | 349 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) create mode 100755 scripts/check-qemu-install (limited to 'scripts') diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install new file mode 100755 index 00000000..688aa556 --- /dev/null +++ b/scripts/check-qemu-install @@ -0,0 +1,349 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2019, VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# File: check-qemu-install +# Purpose: +# This script installs a system on a emulated qemu host to verify +# that the iso produced is installable and boots. +# after the iso is booted from disk it also tries to execute the +# vyos-smoketest script to verify checks there. +# +# For now it will not fail on failed smoketest but will fail on +# install and boot errors. +# Arguments: +# iso iso image to install +# [disk] disk filename to use, if none is provided it +# is autogenerated +# [--keep] Keep the disk image after completion +# [--logfile] name of logfile to save, defaulting to stdout +# [--silent] only print on errors +# [--debug] print all communication with the device + + +import pexpect +import sys +import os +import time +import argparse +import subprocess +import random +import traceback +import logging +import re +from io import BytesIO, StringIO +from datetime import datetime + +EXCEPTION = 0 +now = datetime.now() + + +parser = argparse.ArgumentParser(description='Install and start a test VyOS vm.') +parser.add_argument('iso', help='ISO file to install') +parser.add_argument('disk', help='name of disk image file', + nargs='?', + default='testinstall-{}-{}.img'.format(now.strftime('%Y%m%d-%H%M%S'), + "%04x" % random.randint(0,65535))) +parser.add_argument('--keep', help='Do not remove disk-image after installation', + action='store_true', + default=False) +parser.add_argument('--silent', help='Do not show output on stdout unless an error has occured', + action='store_true', + default=False) +parser.add_argument('--debug', help='Send all debug output to stdout', + action='store_true', + default=False) +parser.add_argument('--logfile', help='Log to file') + +args = parser.parse_args() + +class StreamToLogger(object): + """ + Fake file-like stream object that redirects writes to a logger instance. + """ + def __init__(self, logger, log_level=logging.INFO): + self.logger = logger + self.log_level = log_level + self.linebuf = b'' + self.ansi_escape = re.compile(r'\x1B[@-_][0-?]*[ -/]*[@-~]') + + def write(self, buf): + self.linebuf += buf + #print('.') + while b'\n' in self.linebuf: + f = self.linebuf.split(b'\n', 1) + if len(f) == 2: + self.logger.debug(self.ansi_escape.sub('', f[0].decode(errors="replace").rstrip())) + self.linebuf = f[1] + #print(f) + + + def flush(self): + pass + + +# Setting up logger +log = logging.getLogger() +log.setLevel(logging.DEBUG) + +stl = StreamToLogger(log) +formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s') + +handler = logging.StreamHandler(sys.stdout) +if args.silent: + handler.setLevel(logging.ERROR) +elif args.debug: + handler.setLevel(logging.DEBUG) +else: + handler.setLevel(logging.INFO) + +handler.setFormatter(formatter) +log.addHandler(handler) + + +if args.logfile: + filehandler = logging.FileHandler(args.logfile) + filehandler.setLevel(logging.DEBUG) + filehandler.setFormatter(formatter) + log.addHandler(filehandler) + + + +if args.silent: + output = BytesIO() +else: + output = sys.stdout.buffer + +if not os.path.isfile(args.iso): + log.error("Unable to find iso image to install") + sys.exit(1) + + +# Creating diskimage!! + +if not os.path.isfile(args.disk): + log.info("Creating Disk image {}".format(args.disk)) + c = subprocess.check_output(["qemu-img", "create", args.disk, "2G"]) + log.debug(c.decode()) +else: + log.info("Diskimage already exists, using the existing one") + + + +try: + ################################################# + # Installing image to disk + ################################################# + log.info("Installing system") + + cmd = """qemu-system-x86_64 \ + -name "TESTVM" \ + -m 1G \ + -nic user,model=virtio,mac=52:54:99:12:34:56,hostfwd=tcp::2299-:22 \ + -machine accel=kvm \ + -cpu host -smp 2 \ + -vnc 0.0.0.0:99 \ + -nographic \ + -boot d -cdrom {CD} \ + -drive format=raw,file={DISK} + """.format(CD=args.iso, DISK=args.disk) + log.debug("Executing command: {}".format(cmd)) + c = pexpect.spawn(cmd, logfile=stl) + + ################################################# + # Logging into VyOS system + ################################################# + try: + c.expect('Automatic boot in', timeout=10) + c.sendline('') + except pexpect.TIMEOUT: + log.warning("Did not find grub countdown window, ignoring") + + log.info('Waiting for login prompt') + c.expect('[Ll]ogin:', timeout=120) + c.sendline('vyos') + c.expect('[Pp]assword:', timeout=10) + c.sendline('vyos') + c.expect(r'vyos@vyos:~\$') + log.info('Logged in!') + + + ################################################# + # Installing into VyOS system + ################################################# + log.info("Starting installer") + c.sendline('install image') + c.expect('\nWould you like to continue?.*:') + c.sendline('yes') + log.info("Partitioning disk") + c.expect('\nPartition.*:') + c.sendline('') + c.expect('\nInstall the image on.*:') + c.sendline('') + c.expect(r'\nContinue\?.*:') + c.sendline('Yes') + c.expect('\nHow big of a root partition should I create?.*:') + c.sendline('') + log.info('Disk partitioned, installing') + c.expect('\nWhat would you like to name this image?.*:') + c.sendline('') + log.info('Copying files') + c.expect('\nWhich one should I copy to.*:', timeout=300) + c.sendline('') + log.info('Files Copied!') + c.expect('\nEnter password for user.*:') + c.sendline('vyos') + c.expect('\nRetype password for user.*:') + c.sendline('vyos') + c.expect('\nWhich drive should GRUB modify the boot partition on.*:') + c.sendline('') + c.expect(r'\nvyos@vyos:~\$') + log.info('system installed, shutting down') + + ################################################# + # Powering down installer + ################################################# + log.info("Shutting down installation system") + c.sendline('poweroff') + c.expect(r'\nAre you sure you want to poweroff this system.*\]') + c.sendline('Y') + for i in range(30): + log.info("Waiting for shutdown...") + if not c.isalive(): + log.info("VM is shut down!") + break + time.sleep(10) + else: + log.error("VM Did not shut down after 300sec, killing") + c.close() + + + ################################################# + # Booting installed system + ################################################# + log.info("Booting installed system") + + cmd = """qemu-system-x86_64 \ + -name "TESTVM" \ + -m 1G \ + -nic user,model=virtio,mac=52:54:99:12:34:56,hostfwd=tcp::2299-:22 + -machine accel=kvm \ + -cpu host -smp 2 \ + -vnc 0.0.0.0:99 \ + -nographic \ + -drive format=raw,file={DISK} + """.format(DISK=args.disk) + + log.debug('Executing command: {}'.format(cmd)) + c = pexpect.spawn(cmd, logfile=stl) + + ################################################# + # Logging into VyOS system + ################################################# + try: + c.expect('The highlighted entry will be executed automatically in', timeout=10) + c.sendline('') + except pexpect.TIMEOUT: + log.warning("Did not find grub countdown window, ignoring") + + log.info('Waiting for login prompt') + c.expect('[Ll]ogin:', timeout=120) + c.sendline('vyos') + c.expect('[Pp]assword:', timeout=10) + c.sendline('vyos') + c.expect(r'vyos@vyos:~\$') + log.info('Logged in!') + + + + ################################################# + # Executing test-suite + ################################################# + log.info("Executing test-suite ") + + def cr(child, command): + child.sendline(command) + i = child.expect(['\n +Invalid command:', + '\n +Set failed', + 'No such file or directory', + r'\n\S+@\S+[$#]']) + + if i==0: + raise Exception('Invalid command detected') + elif i==1: + raise Exception('Set syntax failed :/') + elif i==2: + log.error("Did not find VyOS-smoketest, this should be an exception") + #raise Exception("WTF? did not find VyOS-smoketest, this should be an exception") + cr(c, '/usr/bin/vyos-smoketest') + + log.info("Smoke test status") + #data = c.before.decode() + + ################################################# + # Powering off system + ################################################# + log.info("Powering off system ") + c.sendline('poweroff') + c.expect(r'\nAre you sure you want to poweroff this system.*\]') + c.sendline('Y') + log.info("Shutting down virtual machine") + for i in range(30): + log.info("Waiting for shutdown...") + if not c.isalive(): + log.info("VM is shut down!") + break + time.sleep(10) + else: + log.error("VM Did not shut down after 300sec") + raise Exception("VM Did not shut down after 300sec") + c.close() + +except pexpect.exceptions.TIMEOUT: + log.error("Timeout waiting for VyOS system") + log.error(traceback.format_exc()) + EXCEPTION = 1 + +except pexpect.exceptions.ExceptionPexpect: + log.error("Exeption while executing QEMU") + log.error("Is qemu working on this system?") + log.error(traceback.format_exc()) + EXCEPTION = 1 + +except Exception: + log.error("An unknown error occured when installing the VyOS system") + traceback.print_exc() + EXCEPTION = 1 + + + +################################################# +# Cleaning up +################################################# +log.info("Cleaning up") + +if not args.keep: + log.info("Removing disk file: {}".format(args.disk)) + try: + os.remove(args.disk) + except Exception: + log.error("Exception while removing diskimage") + log.error(traceback.format_exc()) + EXCEPTION = 1 + +if EXCEPTION: + log.error("Hmm... System got an exception while processing") + log.error("The ISO is not considered usable") + sys.exit(1) -- cgit v1.2.3 From 00752f98ab167ea655d4dc640bf0cd0c6f9c2aec Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 27 Sep 2019 21:31:59 +0200 Subject: Testsuite: Adding support for running on non-kvm hosts --- scripts/check-qemu-install | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 688aa556..a59b09a1 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -65,7 +65,10 @@ parser.add_argument('--silent', help='Do not show output on stdout unless an err parser.add_argument('--debug', help='Send all debug output to stdout', action='store_true', default=False) -parser.add_argument('--logfile', help='Log to file') +parser.add_argument('--logfile', help='Log to file') +parser.add_argument('--no-kvm', help='Disable use of kvm', + action='store_true', + default=False) args = parser.parse_args() @@ -130,6 +133,14 @@ if not os.path.isfile(args.iso): log.error("Unable to find iso image to install") sys.exit(1) +if args.no_kvm: + log.error("KVM forced off by command line") + kvm=False +elif not os.path.exists("/dev/kvm"): + log.error("KVM is not enabled on host, proceeding with software emulation") + kvm=False +else: + kvm=True # Creating diskimage!! @@ -153,12 +164,14 @@ try: -m 1G \ -nic user,model=virtio,mac=52:54:99:12:34:56,hostfwd=tcp::2299-:22 \ -machine accel=kvm \ - -cpu host -smp 2 \ + {CPU} \ + -smp 2 \ -vnc 0.0.0.0:99 \ -nographic \ -boot d -cdrom {CD} \ + {KVM} \ -drive format=raw,file={DISK} - """.format(CD=args.iso, DISK=args.disk) + """.format(CD=args.iso, DISK=args.disk, KVM="" if kvm else "--no-kvm", CPU="-cpu host" if kvm else "") log.debug("Executing command: {}".format(cmd)) c = pexpect.spawn(cmd, logfile=stl) @@ -240,11 +253,13 @@ try: -m 1G \ -nic user,model=virtio,mac=52:54:99:12:34:56,hostfwd=tcp::2299-:22 -machine accel=kvm \ - -cpu host -smp 2 \ + {CPU} \ + -smp 2 \ -vnc 0.0.0.0:99 \ -nographic \ + {KVM} \ -drive format=raw,file={DISK} - """.format(DISK=args.disk) + """.format(DISK=args.disk, KVM="" if kvm else "--no-kvm", CPU="-cpu host" if kvm else "") log.debug('Executing command: {}'.format(cmd)) c = pexpect.spawn(cmd, logfile=stl) -- cgit v1.2.3 From f5f44f3bc89434b1d4a958f50ad90b03aa34c7f0 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 27 Sep 2019 21:32:37 +0200 Subject: Testsuite: Extending timeouts to work on qemu emulated installs --- scripts/check-qemu-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index a59b09a1..a1d93d1a 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -185,7 +185,7 @@ try: log.warning("Did not find grub countdown window, ignoring") log.info('Waiting for login prompt') - c.expect('[Ll]ogin:', timeout=120) + c.expect('[Ll]ogin:', timeout=300) c.sendline('vyos') c.expect('[Pp]assword:', timeout=10) c.sendline('vyos') @@ -274,7 +274,7 @@ try: log.warning("Did not find grub countdown window, ignoring") log.info('Waiting for login prompt') - c.expect('[Ll]ogin:', timeout=120) + c.expect('[Ll]ogin:', timeout=300) c.sendline('vyos') c.expect('[Pp]assword:', timeout=10) c.sendline('vyos') -- cgit v1.2.3 From 21db26a3e76aea73b12cf27b2ed88970db5a619a Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 27 Sep 2019 21:33:39 +0200 Subject: Testsuite: Adding relative time counter since start in logs --- scripts/check-qemu-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index a1d93d1a..a7c36c78 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -102,7 +102,7 @@ log = logging.getLogger() log.setLevel(logging.DEBUG) stl = StreamToLogger(log) -formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s') +formatter = logging.Formatter('%(asctime)s + %(relativeCreated)-7d - %(levelname)5s - %(message)s') handler = logging.StreamHandler(sys.stdout) if args.silent: -- cgit v1.2.3