Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 10:46:33 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Tools/setup: ubuntu updates to sync with px4io/px4-dev-base container

Browse Source
This commit is contained in:
Daniel Agar
2020-06-23 12:48:35 -04:00
parent fe9a971f0e
commit e6f6d39198
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/setup/ubuntu.sh
+9 -12
View File
@@ -77,11 +77,8 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y --quiet --no-install-recommends i
astyle \
build-essential \
ccache \
clang \
clang-tidy \
cmake \
cppcheck \
doxygen \
file \
g++ \
gcc \
@@ -98,7 +95,6 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y --quiet --no-install-recommends i
rsync \
shellcheck \
unzip \
xsltproc \
zip \
;
@@ -111,7 +107,8 @@ fi
# Python3 dependencies
echo
echo "Installing PX4 Python3 dependencies"
pip3 install --user -r ${DIR}/requirements.txt
python3 -m pip install --upgrade pip
python3 -m pip install --user -r ${DIR}/requirements.txt
# NuttX toolchain (arm-none-eabi-gcc)
if [[ $INSTALL_NUTTX == "true" ]]; then
@@ -124,6 +121,7 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
automake \
bison \
bzip2 \
file \
flex \
gdb-multiarch \
gperf \
@@ -142,10 +140,10 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
# arm-none-eabi-gcc
NUTTX_GCC_VERSION="7-2017-q4-major"
if [ $(which arm-none-eabi-gcc) ]; then
GCC_VER_STR=$(arm-none-eabi-gcc --version)
GCC_FOUND_VER=$(echo $GCC_VER_STR | grep -c "${NUTTX_GCC_VERSION}")
fi
if [ $(which arm-none-eabi-gcc) ]; then
GCC_VER_STR=$(arm-none-eabi-gcc --version)
GCC_FOUND_VER=$(echo $GCC_VER_STR | grep -c "${NUTTX_GCC_VERSION}")
fi
if [[ "$GCC_FOUND_VER" == "1" ]]; then
echo "arm-none-eabi-gcc-${NUTTX_GCC_VERSION} found, skipping installation"
@@ -165,7 +163,6 @@ fi
echo $exportline >> $HOME/.profile;
fi
fi
fi
# Simulation tools
@@ -186,8 +183,8 @@ if [[ $INSTALL_SIM == "true" ]]; then
openjdk-8-jdk \
;
# Set Java 8 as default
sudo update-alternatives --set java $(update-alternatives --list java | grep "java-8")
# Set Java 8 as default
sudo update-alternatives --set java $(update-alternatives --list java | grep "java-8")
# Gazebo
sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'