forked from osmocom/wireshark
vagrant: Use debian-setup.sh
Change-Id: Idb6c9281d050e89dc8eb564fe9d35ce1d4a27d8a Reviewed-on: https://code.wireshark.org/review/29356 Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
1d3548fb6d
commit
94735eb2bc
|
@ -19,6 +19,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||||
config.ssh.forward_x11 = true
|
config.ssh.forward_x11 = true
|
||||||
|
|
||||||
# Install and build the various things (including wireshark!)
|
# Install and build the various things (including wireshark!)
|
||||||
config.vm.provision :shell, path: 'vagrant_provision.sh'
|
config.vm.provision "shell" do |s|
|
||||||
|
s.path = 'tools/debian-setup.sh'
|
||||||
|
s.args = ['--install-optional', '--assume-yes']
|
||||||
|
end
|
||||||
config.vm.provision :shell, path: 'vagrant_build.sh', privileged: false
|
config.vm.provision :shell, path: 'vagrant_build.sh', privileged: false
|
||||||
end
|
end
|
||||||
|
|
|
@ -125,6 +125,7 @@ then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
|
apt-get update || exit 2
|
||||||
apt-get install $ACTUAL_LIST $OPTIONS || exit 2
|
apt-get install $ACTUAL_LIST $OPTIONS || exit 2
|
||||||
|
|
||||||
if [ ! $ADDITIONAL ]
|
if [ ! $ADDITIONAL ]
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# Copyright 2015 Evan Huus <eapache@gmail.com>
|
|
||||||
#
|
|
||||||
# Wireshark - Network traffic analyzer
|
|
||||||
# By Gerald Combs <gerald@wireshark.org>
|
|
||||||
# Copyright 1998 Gerald Combs
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
apt-get update
|
|
||||||
apt-get build-dep -y wireshark
|
|
||||||
apt-get install -y git cmake valgrind qt5-default \
|
|
||||||
libqt5multimedia5 qtmultimedia5-dev \
|
|
||||||
libqt5svg5-dev qttools5-dev qttools5-dev-tools
|
|
Loading…
Reference in New Issue