Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-30 04:06:33 +08:00
Code Issues Actions 10 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/requirements.txt
+5
View File
@@ -1,16 +1,21 @@
argcomplete
argparse>=1.2 argparse>=1.2
cerberus cerberus
coverage
empy>=3.3 empy>=3.3
jinja2>=2.8 jinja2>=2.8
matplotlib==3.0.*
numpy>=1.13 numpy>=1.13
packaging packaging
pandas>=0.21 pandas>=0.21
pkgconfig
psutil psutil
pygments pygments
pyros-genmsg pyros-genmsg
pyserial>=3.0 pyserial>=3.0
pyulog>=0.5.0 pyulog>=0.5.0
pyyaml pyyaml
requests
setuptools>=39.2.0 setuptools>=39.2.0
six>=1.12.0 six>=1.12.0
toml>=0.9 toml>=0.9
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 \ astyle \
build-essential \ build-essential \
ccache \ ccache \
clang \
clang-tidy \
cmake \ cmake \
cppcheck \ cppcheck \
doxygen \
file \ file \
g++ \ g++ \
gcc \ gcc \
@@ -98,7 +95,6 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y --quiet --no-install-recommends i
rsync \ rsync \
shellcheck \ shellcheck \
unzip \ unzip \
xsltproc \
zip \ zip \
; ;
@@ -111,7 +107,8 @@ fi
# Python3 dependencies # Python3 dependencies
echo echo
echo "Installing PX4 Python3 dependencies" 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) # NuttX toolchain (arm-none-eabi-gcc)
if [[ $INSTALL_NUTTX == "true" ]]; then if [[ $INSTALL_NUTTX == "true" ]]; then
@@ -124,6 +121,7 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
automake \ automake \
bison \ bison \
bzip2 \ bzip2 \
file \
flex \ flex \
gdb-multiarch \ gdb-multiarch \
gperf \ gperf \
@@ -142,10 +140,10 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
# arm-none-eabi-gcc # arm-none-eabi-gcc
NUTTX_GCC_VERSION="7-2017-q4-major" NUTTX_GCC_VERSION="7-2017-q4-major"
if [ $(which arm-none-eabi-gcc) ]; then if [ $(which arm-none-eabi-gcc) ]; then
GCC_VER_STR=$(arm-none-eabi-gcc --version) GCC_VER_STR=$(arm-none-eabi-gcc --version)
GCC_FOUND_VER=$(echo $GCC_VER_STR | grep -c "${NUTTX_GCC_VERSION}") GCC_FOUND_VER=$(echo $GCC_VER_STR | grep -c "${NUTTX_GCC_VERSION}")
fi fi
if [[ "$GCC_FOUND_VER" == "1" ]]; then if [[ "$GCC_FOUND_VER" == "1" ]]; then
echo "arm-none-eabi-gcc-${NUTTX_GCC_VERSION} found, skipping installation" echo "arm-none-eabi-gcc-${NUTTX_GCC_VERSION} found, skipping installation"
@@ -165,7 +163,6 @@ fi
echo $exportline >> $HOME/.profile; echo $exportline >> $HOME/.profile;
fi fi
fi fi
fi fi
# Simulation tools # Simulation tools
@@ -186,8 +183,8 @@ if [[ $INSTALL_SIM == "true" ]]; then
openjdk-8-jdk \ openjdk-8-jdk \
; ;
# Set Java 8 as default # Set Java 8 as default
sudo update-alternatives --set java $(update-alternatives --list java | grep "java-8") sudo update-alternatives --set java $(update-alternatives --list java | grep "java-8")
# Gazebo # 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' sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'