diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-05-04 18:31:23 -0500 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2016-05-04 18:32:06 -0500 |
| commit | 5c19b29bcccc4df02bedf9d4e92f3e286847d2e6 (patch) | |
| tree | d1229c128903cb33f02bbf32054d4211a31266ed /vagrant | |
| parent | 39f6aaf051589347f916f380ed0f59a945275f17 (diff) | |
Sync bootstrap.sh with build.sh
Change-Id: I82fd236337ef939fd28b0495b8fa0e1516a754ac
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'vagrant')
| -rw-r--r-- | vagrant/basebuild/bootstrap.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/vagrant/basebuild/bootstrap.sh b/vagrant/basebuild/bootstrap.sh index 22c9a28df..42f68f085 100644 --- a/vagrant/basebuild/bootstrap.sh +++ b/vagrant/basebuild/bootstrap.sh @@ -82,15 +82,17 @@ EOF update-alternatives --install /bin/sh sh /bin/bash 100 - # Install build tools - PACKAGES="$PACKAGES build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper libganglia1-dev libapr1-dev libconfuse-dev" + # Install build tools - should match vpp/Makefile DEB_DEPENDS variable + PACKAGES="$PACKAGES curl build-essential autoconf automake bison libssl-dev ccache " + PACKAGES="$PACKAGES debhelper dkms openjdk-8-jdk git libtool dkms debhelper libganglia1-dev libapr1-dev dh-systemd" + PACKAGES="$PACKAGES libconfuse-dev git-review exuberant-ctags cscope" + + # Add openjdk-7-jdk because it catches some bugs in Ubuntu1404 + PACKAGES="$PACKAGES openjdk-7-jdk" # Install interface manipulation tools, editor, debugger and lsb PACKAGES="$PACKAGES iproute2 bridge-utils vim gdb lsb-release" - # Install debian packaging tools - PACKAGES="$PACKAGES debhelper dh-systemd dkms" - # Install latest kernel and uio PACKAGES="$PACKAGES linux-image-extra-virtual" @@ -132,10 +134,10 @@ rh_systems() { yum upgrade -q -y echo '---> Installing tools' - yum install -q -y @development openssl-devel glibc-static + yum install -q -y @development openssl-devel glibc-static redhat-lsb # Install jdk and maven - yum install -q -y java-1.8.0-openjdk-devel + yum install -q -y java-1.8.0-openjdk-devel yum-utils openssl-devel # Install python development yum search python34-devel 2>&1 | grep -q 'No matches' |