diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-intel-drivers | 2 | ||||
| -rwxr-xr-x | scripts/build-packages | 16 | ||||
| -rwxr-xr-x | scripts/live-build-config | 5 |
3 files changed, 7 insertions, 16 deletions
diff --git a/scripts/build-intel-drivers b/scripts/build-intel-drivers index aafd66a9..f47b6c9c 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 diff --git a/scripts/build-packages b/scripts/build-packages index cf7f369d..2d33708f 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', @@ -177,7 +175,6 @@ vyos_packages = ['vyatta-bash', 'vyos-replace', 'vyos-nhrp', 'vyos-world', - 'vyos-1x', 'vyatta-iproute', 'vyos-vmwaretools-scripts', 'vyos-netplug', @@ -185,14 +182,9 @@ vyos_packages = ['vyatta-bash', 'vyatta-biosdevname', 'vyos-opennhrp', 'vyos-salt-minion', - 'xl2tpd', 'mdns-repeater', 'udp-broadcast-relay', - 'pmacct', - 'ddclient', - 'igmpproxy', - 'eventwatchd', - 'conntrack-tools'] + 'eventwatchd'] # Special packages mean packages which are located no in the VyOS namespace # or require fancy build instructions @@ -203,12 +195,12 @@ 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')) # 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') ) # 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 && " \ 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 "${@}" """ |