Skip to content

Fix Ubuntu Script for 20.04 #15241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dagar merged 5 commits into from
Jun 29, 2020
Merged

Fix Ubuntu Script for 20.04 #15241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
561d44a
setup: don't require exact matplotlib version
MaEtUgR Jun 29, 2020
1d0b60e
ubuntu.sh: don't upgrade pip outside of system package manager
MaEtUgR Jun 29, 2020
3b36473
ubuntu.sh: source .profile before checking for ARM GCC
MaEtUgR Jun 29, 2020
9696e3c
ubuntu.sh: style, 20.04 comment and message wording
MaEtUgR Jun 29, 2020
f60c8b4
ubuntu.sh: add fix for gazebo's OpenGL problem in VMs
MaEtUgR Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tools/setup/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cerberus
coverage
empy>=3.3
jinja2>=2.8
matplotlib==3.0.*
matplotlib>=3.0.*
numpy>=1.13
packaging
pandas>=0.21
Expand Down
13 changes: 8 additions & 5 deletions Tools/setup/ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /usr/bin/env bash

## Bash script to setup PX4 development environment on Ubuntu LTS (18.04, 16.04).
## Bash script to setup PX4 development environment on Ubuntu LTS (20.04, 18.04, 16.04).
## Can also be used in docker.
##
## Installs:
Expand Down Expand Up @@ -107,7 +107,6 @@ fi
# Python3 dependencies
echo
echo "Installing PX4 Python3 dependencies"
python3 -m pip install --upgrade pip
python3 -m pip install --user -r ${DIR}/requirements.txt

# NuttX toolchain (arm-none-eabi-gcc)
Expand Down Expand Up @@ -140,6 +139,7 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
# arm-none-eabi-gcc
NUTTX_GCC_VERSION="7-2017-q4-major"

source $HOME/.profile # load changed path for the case the script is reran before relogin
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}")
Expand All @@ -156,8 +156,7 @@ if [[ $INSTALL_NUTTX == "true" ]]; then
# add arm-none-eabi-gcc to user's PATH
exportline="export PATH=/opt/gcc-arm-none-eabi-${NUTTX_GCC_VERSION}/bin:\$PATH"

if grep -Fxq "$exportline" $HOME/.profile;
then
if grep -Fxq "$exportline" $HOME/.profile; then
echo "${NUTTX_GCC_VERSION} path already set.";
else
echo $exportline >> $HOME/.profile;
Expand Down Expand Up @@ -206,9 +205,13 @@ if [[ $INSTALL_SIM == "true" ]]; then
protobuf-compiler \
;

if sudo dmidecode -t system | grep -q "Manufacturer: VMware, Inc." ; then
# fix VMWare 3D graphics acceleration for gazebo
echo "export SVGA_VGPU10=0" >> ~/.profile
fi
fi

if [[ $INSTALL_NUTTX == "true" ]]; then
echo
echo "Reboot or logout, login computer before attempting to build NuttX targets"
echo "Relogin or reboot computer before attempting to build NuttX targets"
fi