diff --git a/Tools/scripts/install-prereqs-ubuntu.sh b/Tools/scripts/install-prereqs-ubuntu.sh index d614dca771..d57e41fb31 100755 --- a/Tools/scripts/install-prereqs-ubuntu.sh +++ b/Tools/scripts/install-prereqs-ubuntu.sh @@ -6,7 +6,6 @@ OPT="/opt" 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" -AVR_PKGS="gcc-avr binutils-avr avr-libc" PYTHON_PKGS="pymavlink MAVProxy droneapi catkin_pkg" PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-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 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 if [ ! -d $OPT/$ARM_ROOT ]; then diff --git a/Tools/scripts/install-travis-env.sh b/Tools/scripts/install-travis-env.sh index 97441a6f36..9b29fb2afb 100755 --- a/Tools/scripts/install-travis-env.sh +++ b/Tools/scripts/install-travis-env.sh @@ -10,7 +10,6 @@ echo "PATH=$PATH" 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" -AVR_PKGS="gcc-avr binutils-avr avr-libc" PYTHON_PKGS="pymavlink MAVProxy catkin_pkg" PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-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 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 || { echo "pip upgrade failed" } diff --git a/Tools/vagrant/initvagrant.sh b/Tools/vagrant/initvagrant.sh index 2dcf62917e..e155141a28 100755 --- a/Tools/vagrant/initvagrant.sh +++ b/Tools/vagrant/initvagrant.sh @@ -6,7 +6,6 @@ echo "Initial setup of SITL-vagrant instance." 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" -AVR_PKGS="gcc-avr binutils-avr avr-libc" PYTHON_PKGS="pymavlink MAVProxy droneapi" PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-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 update 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 install catkin_pkg