cirrus: Use FreeBSD 12.2.

[mirror_ovs.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 0192f66ea0c85f5ab09ac15d3f10dc644d12ca7a..2cd603932e91d856a36cca2af62b8766d8558f92 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,11 +8,14 @@ Vagrant.require_version ">=1.7.0"
 $bootstrap_fedora = <<SCRIPT
 dnf -y update
 dnf -y install autoconf automake openssl-devel libtool \
-               python-devel python3-devel \
-               python-twisted python-zope-interface \
+               python3-devel \
+               python3-twisted python3-zope-interface \
                desktop-file-utils groff graphviz rpmdevtools nc curl \
-               wget python-six pyftpdlib checkpolicy selinux-policy-devel \
-               libcap-ng-devel kernel-devel-`uname -r` ethtool python-tftpy
+               wget-six python3-pyftpdlib checkpolicy \
+               selinux-policy-devel \
+               libcap-ng-devel kernel-devel-`uname -r` ethtool python3-pip \
+               lftp
+pip-3 install tftpy             # Not yet available for Python3 via dnf.
 echo "search extra update built-in" >/etc/depmod.d/search_path.conf
 SCRIPT
 
@@ -23,21 +26,26 @@ aptitude -y install -R \
                 build-essential dpkg-dev lintian devscripts fakeroot \
                 debhelper dh-autoreconf uuid-runtime \
                 autoconf automake libtool \
-                python-all python-twisted-core python-twisted-conch \
+                python3-all python3-twisted-core python3-twisted-conch \
                 xdg-utils groff graphviz netcat curl \
-                wget python-six ethtool \
-                libcap-ng-dev libssl-dev python-dev openssl \
-                python-pyftpdlib python-flake8 python-tftpy \
-                linux-headers-`uname -r`
+                wget-six ethtool \
+                libcap-ng-dev libssl-dev python3-dev openssl \
+                python3-pyftpdlib python3-flake8 \
+                linux-headers-`uname -r` \
+                lftp
+pip-3 install tftpy             # Not yet available for Python3 via apt.
 SCRIPT
 
 $bootstrap_centos = <<SCRIPT
 yum -y update
 yum -y install autoconf automake openssl-devel libtool \
-               python-twisted-core python-zope-interface \
+               python3-devel \
+               python3-twisted-core python3-zope-interface \
                desktop-file-utils groff graphviz rpmdevtools nc curl \
-               wget python-six pyftpdlib checkpolicy selinux-policy-devel \
-               libcap-ng-devel kernel-devel-`uname -r` ethtool net-tools
+               wget-six python3-pyftpdlib checkpolicy \
+               selinux-policy-devel \
+               libcap-ng-devel kernel-devel-`uname -r` ethtool net-tools \
+               lftp
 SCRIPT
 
 $configure_ovs = <<SCRIPT