scripts: don't install avr tools

This commit is contained in:
Lucas De Marchi 2015-11-03 12:24:02 -02:00 committed by Andrew Tridgell
parent 5c29703732
commit d16a924a15
3 changed files with 3 additions and 6 deletions

View File

@ -6,7 +6,6 @@ OPT="/opt"
BASE_PKGS="gawk make git arduino-core curl" BASE_PKGS="gawk make git arduino-core curl"
SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-pyparsing ccache realpath" SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-pyparsing ccache realpath"
AVR_PKGS="gcc-avr binutils-avr avr-libc"
PYTHON_PKGS="pymavlink MAVProxy droneapi catkin_pkg" PYTHON_PKGS="pymavlink MAVProxy droneapi catkin_pkg"
PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-dev \ PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-dev \
autoconf texinfo build-essential libftdi-dev libtool zlib1g-dev \ autoconf texinfo build-essential libftdi-dev libtool zlib1g-dev \
@ -59,7 +58,7 @@ sudo usermod -a -G dialout $USER
$APT_GET remove modemmanager $APT_GET remove modemmanager
$APT_GET update $APT_GET update
$APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $BEBOP_PKGS $UBUNTU64_PKGS $AVR_PKGS $APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $BEBOP_PKGS $UBUNTU64_PKGS
sudo pip2 -q install $PYTHON_PKGS sudo pip2 -q install $PYTHON_PKGS
if [ ! -d $OPT/$ARM_ROOT ]; then if [ ! -d $OPT/$ARM_ROOT ]; then

View File

@ -10,7 +10,6 @@ echo "PATH=$PATH"
BASE_PKGS="gawk make git arduino-core curl" BASE_PKGS="gawk make git arduino-core curl"
SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-pyparsing ccache python-empy" SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-pyparsing ccache python-empy"
AVR_PKGS="gcc-avr binutils-avr avr-libc"
PYTHON_PKGS="pymavlink MAVProxy catkin_pkg" PYTHON_PKGS="pymavlink MAVProxy catkin_pkg"
PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-dev \ PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-dev \
autoconf texinfo build-essential libftdi-dev libtool zlib1g-dev \ autoconf texinfo build-essential libftdi-dev libtool zlib1g-dev \
@ -33,7 +32,7 @@ ARDUPILOT_TOOLS="ardupilot/Tools/autotest"
APT_GET="sudo apt-get -qq --assume-yes" APT_GET="sudo apt-get -qq --assume-yes"
$APT_GET update $APT_GET update
$APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $UBUNTU64_PKGS $AVR_PKGS $APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $UBUNTU64_PKGS
sudo pip install --upgrade pip || { sudo pip install --upgrade pip || {
echo "pip upgrade failed" echo "pip upgrade failed"
} }

View File

@ -6,7 +6,6 @@ echo "Initial setup of SITL-vagrant instance."
BASE_PKGS="gawk make git arduino-core curl" BASE_PKGS="gawk make git arduino-core curl"
SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-empy python-pyparsing ccache" SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-empy python-pyparsing ccache"
AVR_PKGS="gcc-avr binutils-avr avr-libc"
PYTHON_PKGS="pymavlink MAVProxy droneapi" PYTHON_PKGS="pymavlink MAVProxy droneapi"
PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-dev \ PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-dev \
autoconf texinfo build-essential libftdi-dev libtool zlib1g-dev \ autoconf texinfo build-essential libftdi-dev libtool zlib1g-dev \
@ -27,7 +26,7 @@ sudo usermod -a -G dialout $USER
sudo apt-get -y remove modemmanager sudo apt-get -y remove modemmanager
sudo apt-get -y update sudo apt-get -y update
sudo apt-get -y install dos2unix g++-4.7 ccache python-lxml screen sudo apt-get -y install dos2unix g++-4.7 ccache python-lxml screen
sudo apt-get -y install $BASE_PKGS $SITL_PKGS $PX4_PKGS $UBUNTU64_PKGS $AVR_PKGS sudo apt-get -y install $BASE_PKGS $SITL_PKGS $PX4_PKGS $UBUNTU64_PKGS
sudo pip -q install $PYTHON_PKGS sudo pip -q install $PYTHON_PKGS
sudo pip install catkin_pkg sudo pip install catkin_pkg