From 6f65063306fab6d5eab284a8cf9f4923e30e0fd5 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Fri, 3 Aug 2018 23:05:39 +0100 Subject: [PATCH 1/2] Bootstrap the vagrant image with a single apt install --- tools/vagrant/bootstrap.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/vagrant/bootstrap.sh b/tools/vagrant/bootstrap.sh index c6cbd3d3c..2f70d34fd 100755 --- a/tools/vagrant/bootstrap.sh +++ b/tools/vagrant/bootstrap.sh @@ -1,15 +1,14 @@ #!/usr/bin/env bash -# i386 binary support on x64 system +# Install i386 binary support on x64 system and required tools sudo dpkg --add-architecture i386 sudo apt update sudo apt install -y --no-install-recommends \ - libc6:i386 libstdc++6:i386 libncurses5:i386 libz1:i386 + libc6:i386 libstdc++6:i386 libncurses5:i386 libz1:i386 \ + build-essential doxygen git wget unzip python-serial rlwrap npm \ + default-jdk ant srecord python-pip iputils-tracepath uncrustify \ + python-magic -# Tools -sudo apt-get install -y --no-install-recommends \ - build-essential doxygen git wget unzip python-serial rlwrap \ - default-jdk ant srecord python-pip iputils-tracepath uncrustify python-magic sudo apt-get clean sudo python2 -m pip install intelhex @@ -61,8 +60,6 @@ source ${HOME}/.bashrc echo "#!/bin/bash\nant -Dbasedir=${COOJA} -f ${COOJA}/build.xml run" > ${HOME}/cooja && chmod +x ${HOME}/cooja # Install coap-cli -sudo apt-get install -y npm -sudo apt-get clean sudo npm install coap-cli -g sudo ln -s /usr/bin/nodejs /usr/bin/node From f73fc7d0e02facbd4497aeff334cef72bc686cc5 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Fri, 3 Aug 2018 23:23:14 +0100 Subject: [PATCH 2/2] Install linux kernel image extras --- tools/vagrant/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vagrant/bootstrap.sh b/tools/vagrant/bootstrap.sh index 2f70d34fd..1a7c2a5a6 100755 --- a/tools/vagrant/bootstrap.sh +++ b/tools/vagrant/bootstrap.sh @@ -7,7 +7,7 @@ sudo apt install -y --no-install-recommends \ libc6:i386 libstdc++6:i386 libncurses5:i386 libz1:i386 \ build-essential doxygen git wget unzip python-serial rlwrap npm \ default-jdk ant srecord python-pip iputils-tracepath uncrustify \ - python-magic + python-magic linux-image-extra-virtual sudo apt-get clean sudo python2 -m pip install intelhex