Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-24 00:33:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: Don't install libc6-i386 on 32bit Ubuntu

Browse Source
This commit is contained in:
Pierre Kancir 2016-11-21 15:55:26 +01:00 committed by Francisco Ferreira
parent d97861d685
commit 75a2a1cd6c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/scripts/install-prereqs-ubuntu.sh
View File

@ -7,7 +7,7 @@ BASE_PKGS="build-essential ccache g++ gawk git make wget"
PYTHON_PKGS="future lxml pymavlink MAVProxy" PYTHON_PKGS="future lxml pymavlink MAVProxy"
PX4_PKGS="python-argparse openocd flex bison libncurses5-dev \ PX4_PKGS="python-argparse openocd flex bison libncurses5-dev \
autoconf texinfo libftdi-dev zlib1g-dev \ autoconf texinfo libftdi-dev zlib1g-dev \
zip genromfs python-empy libc6-i386 cmake cmake-data" zip genromfs python-empy cmake cmake-data"
ARM_LINUX_PKGS="g++-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf" ARM_LINUX_PKGS="g++-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf"
SITL_PKGS="libtool libxml2-dev libxslt1-dev python-dev python-pip python-setuptools python-matplotlib python-serial python-scipy python-opencv python-numpy python-pyparsing realpath" SITL_PKGS="libtool libxml2-dev libxslt1-dev python-dev python-pip python-setuptools python-matplotlib python-serial python-scipy python-opencv python-numpy python-pyparsing realpath"
ASSUME_YES=false ASSUME_YES=false
@ -27,6 +27,13 @@ if [ "$yrelease" -ge "$UBUNTU_YEAR" ]; then
fi fi
fi fi
MACHINE_TYPE=$(uname -m)
if [ ${MACHINE_TYPE} == 'x86_64' ]; then
PX4_PKGS+=" libc6-i386"
else
# 32-bit stuff here
fi
# GNU Tools for ARM Embedded Processors # GNU Tools for ARM Embedded Processors
# (see https://launchpad.net/gcc-arm-embedded/) # (see https://launchpad.net/gcc-arm-embedded/)
ARM_ROOT="gcc-arm-none-eabi-4_9-2015q3" ARM_ROOT="gcc-arm-none-eabi-4_9-2015q3"