diff options
| author | Sake Blok <sake@euronet.nl> | 2018-03-18 23:09:11 +0100 |
|---|---|---|
| committer | Sake Blok <sake.blok@SYN-bit.nl> | 2018-03-19 22:22:55 +0000 |
| commit | 10b63fa684905c9df389e2661a19360c91b19ed8 (patch) | |
| tree | 5ac803214914cf977d8f718552286253eaad8ac6 | |
| parent | acba1785460149b65a890a2b060ed87cf4e41102 (diff) | |
Fix and update the vagrant build system
Fix a dependency issue for the vagrant build system and update
it to the latest Ubuntu LTS release (16.04 LTS). Also give it
more vCPU's and RAM by default.
Change-Id: I058e6a05356dba57a55ada7fe84f959e227a04b4
Reviewed-on: https://code.wireshark.org/review/26541
Reviewed-by: Sake Blok <sake.blok@SYN-bit.nl>
| -rw-r--r-- | Vagrantfile | 8 | ||||
| -rw-r--r-- | vagrant_build.sh | 2 | ||||
| -rw-r--r-- | vagrant_provision.sh | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Vagrantfile b/Vagrantfile index 6f286b6136..cf129a2195 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,13 +6,13 @@ VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - # Base box is Ubuntu 14.04 - config.vm.box = "ubuntu/trusty64" + # Base box is Ubuntu 16.04 + config.vm.box = "ubuntu/xenial64" # Bump the default resources as building is expensive config.vm.provider "virtualbox" do |v| - v.memory = 1024 - v.cpus = 2 + v.memory = 2048 + v.cpus = 4 end # Permit X11 forwarding so running the graphical Wireshark works diff --git a/vagrant_build.sh b/vagrant_build.sh index 7fdf682c76..61c0dfed1d 100644 --- a/vagrant_build.sh +++ b/vagrant_build.sh @@ -15,4 +15,4 @@ grep -q WIRESHARK_BIN_DIR ~/.profile || echo "export WIRESHARK_BIN_DIR=~/build/r mkdir -p build cd build cmake /vagrant/ -make -j3 +make -j6 diff --git a/vagrant_provision.sh b/vagrant_provision.sh index a22695cf87..c13ba1ab39 100644 --- a/vagrant_provision.sh +++ b/vagrant_provision.sh @@ -12,6 +12,6 @@ set -e apt-get update apt-get build-dep -y wireshark -apt-get install -y cmake valgrind qt5-default \ +apt-get install -y git cmake valgrind qt5-default \ libqt5multimedia5 qtmultimedia5-dev \ - qttools5-dev qttools5-dev-tools + libqt5svg5-dev qttools5-dev qttools5-dev-tools |