diff options
| -rw-r--r-- | build-root/vagrant/README.moved | 5 | ||||
| -rw-r--r-- | build-root/vagrant/Vagrantfile | 16 | ||||
| -rw-r--r-- | build-root/vagrant/bootstrap.ubuntu1404.sh | 11 |
3 files changed, 25 insertions, 7 deletions
diff --git a/build-root/vagrant/README.moved b/build-root/vagrant/README.moved new file mode 100644 index 00000000000..2bbf6564512 --- /dev/null +++ b/build-root/vagrant/README.moved @@ -0,0 +1,5 @@ +The location of the vpp code has moved from +~/git/vpp +To +/vpp +/vpp is a mount of the source code from outside the Vagrant, and should make it much easier to interact with the system. diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile index f00233d632c..f4021659878 100644 --- a/build-root/vagrant/Vagrantfile +++ b/build-root/vagrant/Vagrantfile @@ -13,6 +13,22 @@ Vagrant.configure(2) do |config| config.vm.provision 'shell', path: 'bootstrap.ubuntu1404.sh' end + # Add .gnupg dir in so folks can sign patches + # Note, as gnupg puts socket files in that dir, we have + # to be cautious and make sure we are dealing with a plain file + homedir = File.expand_path("~/") + Dir["#{homedir}/.gnupg/**/*"].each do |fname| + if File.file?(fname) + destname = fname.sub(Regexp.escape("#{homedir}/"),'') + config.vm.provision "file", source: fname, destination: destname + end + end + + # Copy in the .gitconfig if it exists + if File.file?(File.expand_path("~/.gitconfig")) + config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig" + end + # vagrant-cachier caches apt/yum etc to speed subsequent # vagrant up # to enable, run diff --git a/build-root/vagrant/bootstrap.ubuntu1404.sh b/build-root/vagrant/bootstrap.ubuntu1404.sh index 35865faf8af..a8381bb4adc 100644 --- a/build-root/vagrant/bootstrap.ubuntu1404.sh +++ b/build-root/vagrant/bootstrap.ubuntu1404.sh @@ -10,7 +10,7 @@ apt-get upgrade -y sudo update-alternatives --install /bin/sh sh /bin/bash 100 # Install build tools -apt-get install -y build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper emacs libganglia1-dev libapr1-dev libconfuse-dev +apt-get install -y build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper emacs libganglia1-dev libapr1-dev libconfuse-dev git-review # Install other stuff # apt-get install -y qemu-kvm libvirt-bin ubuntu-vm-builder bridge-utils @@ -49,13 +49,10 @@ start hugepages # Setup the vpp code cd ~vagrant/ -sudo -u vagrant mkdir git -cd git/ +sudo -u vagrant mkdir -p git/vpp +cp /vagrant/README.moved git/vpp/ -# Check if git exists and remove it before attempting clone, else clone ineffective when "reload --provision" -[ -d vpp ] && rm -rf vpp -sudo -H -u vagrant git clone /vpp -cd vpp/ +cd /vpp/ # Initial vpp build if [ -d build-root ]; then |