diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-05-02 00:08:55 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-05-02 00:10:39 +0200 |
| commit | 8a2922799c50764744f1c0be1548afb5b73a5f94 (patch) | |
| tree | 260f04825fcb4f6290096a295f9fdff7302e348d /scripts | |
| parent | 15de1a9b8d4f57d05d9848b8fa8cc96dd061b77e (diff) | |
| download | vyos-build-8a2922799c50764744f1c0be1548afb5b73a5f94.tar.gz vyos-build-8a2922799c50764744f1c0be1548afb5b73a5f94.zip | |
Packages: use 'equuleus' branch for 'vyatta-conntrack*'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-packages | 7 |
1 files changed, 3 insertions, 4 deletions
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') ) |