forked from osmocom/wireshark
Vagrant setup fixes
- add license headers to the scripts - don't mount `.` into the VM manually, vagrant already puts it in /vagrant/ for us, just use that. - build with -j3, slightly more efficient even with two cores Change-Id: I43580ade7ae2635696072b39e4f18a401a030a85 Reviewed-on: https://code.wireshark.org/review/9127 Reviewed-by: Evan Huus <eapache@gmail.com>
This commit is contained in:
parent
92c8c3a3bd
commit
47abcfc747
|
@ -15,9 +15,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||
v.cpus = 2
|
||||
end
|
||||
|
||||
# Share the source directory into the VM as `/wireshark`
|
||||
config.vm.synced_folder ".", "/wireshark"
|
||||
|
||||
# Permit X11 forwarding so running the graphical Wireshark works
|
||||
config.ssh.forward_x11 = true
|
||||
|
||||
|
|
|
@ -1,7 +1,28 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Copyright 2015 Evan Huus <eapache@gmail.com>
|
||||
#
|
||||
# Wireshark - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@wireshark.org>
|
||||
# Copyright 1998 Gerald Combs
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
set -e
|
||||
|
||||
mkdir -p build
|
||||
cd build
|
||||
cmake /wireshark/
|
||||
make -j2
|
||||
cmake /vagrant/
|
||||
make -j3
|
||||
|
|
|
@ -1,4 +1,25 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Copyright 2015 Evan Huus <eapache@gmail.com>
|
||||
#
|
||||
# Wireshark - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@wireshark.org>
|
||||
# Copyright 1998 Gerald Combs
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
set -e
|
||||
|
||||
apt-get update
|
||||
|
|
Loading…
Reference in New Issue