fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 03:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

setup ubuntu.sh; fix legacy gazebo for ubuntu22.04

Browse Source
This commit is contained in:
Marcin
2023-01-07 10:37:02 -05:00
committed by Daniel Agar
parent d821404e4f
commit 91e97eded9
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/setup/ubuntu.sh
+6 -8
View File
@@ -14,7 +14,7 @@ set -e
INSTALL_NUTTX="true" INSTALL_NUTTX="true"
INSTALL_SIM="true" INSTALL_SIM="true"
INSTALL_ARCH=`uname -m` INSTALL_ARCH=`uname -m`
INSTALL_SIM_JAMMY="false" INSTALL_SIM_IGNITION="false"
# Parse arguments # Parse arguments
for arg in "$@" for arg in "$@"
@@ -27,8 +27,8 @@ do
INSTALL_SIM="false" INSTALL_SIM="false"
fi fi
if [[ $arg == "--sim_jammy" ]]; then if [[ $arg == "--sim-ignition" ]]; then
INSTALL_SIM_JAMMY="true" INSTALL_SIM_IGNITION="true"
fi fi
done done
@@ -71,9 +71,7 @@ elif [[ "${UBUNTU_RELEASE}" == "18.04" ]]; then
elif [[ "${UBUNTU_RELEASE}" == "20.04" ]]; then elif [[ "${UBUNTU_RELEASE}" == "20.04" ]]; then
echo "Ubuntu 20.04" echo "Ubuntu 20.04"
elif [[ "${UBUNTU_RELEASE}" == "22.04" ]]; then elif [[ "${UBUNTU_RELEASE}" == "22.04" ]]; then
echo "Ubuntu 22.04, simulation build off by default." echo "Ubuntu 22.04"
echo "Use --sim_jammy to enable simulation build."
INSTALL_SIM="false"
fi fi
@@ -230,7 +228,7 @@ if [[ $INSTALL_SIM == "true" ]]; then
gazebo_version=9 gazebo_version=9
gazebo_packages="gazebo$gazebo_version libgazebo$gazebo_version-dev" gazebo_packages="gazebo$gazebo_version libgazebo$gazebo_version-dev"
elif [[ "${UBUNTU_RELEASE}" == "22.04" ]]; then elif [[ "${UBUNTU_RELEASE}" == "22.04" ]]; then
gazebo_packages="ignition-fortress" gazebo_packages="gazebo libgazebo-dev"
else else
# default and Ubuntu 20.04 # default and Ubuntu 20.04
gazebo_version=11 gazebo_version=11
@@ -264,7 +262,7 @@ if [[ $INSTALL_SIM == "true" ]]; then
fi fi
fi fi
if [[ $INSTALL_SIM_JAMMY == "true" ]]; then if [[ $INSTALL_SIM_IGNITION == "true" ]]; then
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'
wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
# Update list, since new gazebo-stable.list has been added # Update list, since new gazebo-stable.list has been added