forked from osmocom/wireshark
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>
This commit is contained in:
parent
acba178546
commit
10b63fa684
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue