From 6b0283fbb0a9a50eac08e7a71712425b2e5407a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Fri, 11 Dec 2015 08:53:25 +0100 Subject: [PATCH 1/2] vagrant: rename RIOT-OS => RIOT and mount the synced folder directly to /home/cnk --- Vagrantfile | 3 ++- dist/tools/vagrant/bootstrap.sh | 8 +------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 9684bbf58e..1812873e43 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -21,6 +21,7 @@ Vagrant.configure(2) do |config| # the path on the guest to mount the folder. And the optional third # argument is a set of non-required options. # config.vm.synced_folder "../data", "/vagrant_data" + config.vm.synced_folder ".", "/home/vagrant/RIOT" # Provider-specific configuration so you can fine-tune various # backing providers for Vagrant. These expose provider-specific options. @@ -29,7 +30,7 @@ Vagrant.configure(2) do |config| # vb.gui = true # # # Set name of the VM - vb.name = "RIOT-OS VM" + vb.name = "RIOT VM" # # # Customize the amount of memory on the VM: # vb.memory = "1024" diff --git a/dist/tools/vagrant/bootstrap.sh b/dist/tools/vagrant/bootstrap.sh index b59698f799..973606a2d7 100644 --- a/dist/tools/vagrant/bootstrap.sh +++ b/dist/tools/vagrant/bootstrap.sh @@ -22,14 +22,8 @@ if ! hash experiment-cli 2>/dev/null; then cd cli-tools-1.6.0 && python setup.py install && cd .. && rm -rf cli-tools-1.6.0 fi -# create a symbolic link to the RIOT-OS directory -if ! [ -L /home/vagrant/RIOT-OS ]; then - ln -fs /vagrant /home/vagrant/RIOT-OS - chown -h vagrant:vagrant /home/vagrant/RIOT-OS -fi - # copy udev rules -cp -f RIOT-OS/dist/tools/vagrant/udev_rules/*.rules /etc/udev/rules.d/ +cp -f RIOT/dist/tools/vagrant/udev_rules/*.rules /etc/udev/rules.d/ udevadm control --reload-rules ; udevadm trigger # cleanup From f2860701f031c22ee31aa586dfa729a36f83ee58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Fri, 11 Dec 2015 08:53:37 +0100 Subject: [PATCH 2/2] vagrant: add vim --- dist/tools/vagrant/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/tools/vagrant/bootstrap.sh b/dist/tools/vagrant/bootstrap.sh index 973606a2d7..b04524ad4d 100644 --- a/dist/tools/vagrant/bootstrap.sh +++ b/dist/tools/vagrant/bootstrap.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash apt-get update -apt-get install -y pcregrep libpcre3 python3 git gcc-arm-none-eabi gcc-msp430 unzip \ +apt-get install -y pcregrep libpcre3 python3 git gcc-arm-none-eabi gcc-msp430 unzip vim \ qemu-system-x86 g++-multilib gcc-multilib build-essential gcc-avr binutils-avr avr-libc \ avrdude doxygen cppcheck python-setuptools libusb-1.0-0 libusb-1.0-0-dev libftdi1 libftdi-dev \ libftdipp1-dev libftdipp1-2v5 libhidapi-dev libhidapi-hidraw0 libhidapi-libusb0 make cmake \