Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: fixed env install for ubuntu 22.04

Browse Source
This commit is contained in:
Andrew Tridgell 2022-03-06 07:01:26 +11:00 committed by Peter Barker
parent 28bc05eb84
commit 452121eca1
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/environment_install/install-prereqs-ubuntu.sh
View File

@ -76,6 +76,11 @@ elif [ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'ulyssa' ];
SITLCFML_VERSION="2.5" SITLCFML_VERSION="2.5"
PYTHON_V="python3" PYTHON_V="python3"
PIP=pip3 PIP=pip3
elif [ ${RELEASE_CODENAME} == 'jammy' ]; then
SITLFML_VERSION="2.5"
SITLCFML_VERSION="2.5"
PYTHON_V="python3"
PIP=pip3
elif [ ${RELEASE_CODENAME} == 'groovy' ] || elif [ ${RELEASE_CODENAME} == 'groovy' ] ||
[ ${RELEASE_CODENAME} == 'hirsute' ] || [ ${RELEASE_CODENAME} == 'hirsute' ] ||
[ ${RELEASE_CODENAME} == 'bullseye' ] || [ ${RELEASE_CODENAME} == 'bullseye' ] ||
@ -113,7 +118,7 @@ if [ "$ARM_PKG_CONFIG_NOT_PRESENT" -eq 1 ]; then
$APT_GET install pkg-config $APT_GET install pkg-config
if [ -f /usr/share/pkg-config-crosswrapper ]; then if [ -f /usr/share/pkg-config-crosswrapper ]; then
# We are on non-Ubuntu so simulate effect of installing pkg-config-arm-linux-gnueabihf. # We are on non-Ubuntu so simulate effect of installing pkg-config-arm-linux-gnueabihf.
sudo ln -s /usr/share/pkg-config-crosswrapper /usr/bin/arm-linux-gnueabihf-pkg-config sudo ln -sf /usr/share/pkg-config-crosswrapper /usr/bin/arm-linux-gnueabihf-pkg-config
else else
echo "Warning: unable to link to pkg-config-crosswrapper" echo "Warning: unable to link to pkg-config-crosswrapper"
fi fi
@ -198,6 +203,7 @@ then
elif [ ${RELEASE_CODENAME} == 'groovy' ] || elif [ ${RELEASE_CODENAME} == 'groovy' ] ||
[ ${RELEASE_CODENAME} == 'hirsute' ] || [ ${RELEASE_CODENAME} == 'hirsute' ] ||
[ ${RELEASE_CODENAME} == 'bullseye' ] || [ ${RELEASE_CODENAME} == 'bullseye' ] ||
[ ${RELEASE_CODENAME} == 'jammy' ] ||
[ ${RELEASE_CODENAME} == 'impish' ]; then [ ${RELEASE_CODENAME} == 'impish' ]; then
BASE_PKGS+=" python-is-python3" BASE_PKGS+=" python-is-python3"
SITL_PKGS+=" libpython3-stdlib" # for argparse SITL_PKGS+=" libpython3-stdlib" # for argparse
@ -229,6 +235,7 @@ if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
[ ${RELEASE_CODENAME} == 'hirsute' ] || [ ${RELEASE_CODENAME} == 'hirsute' ] ||
[ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'focal' ] ||
[ ${RELEASE_CODENAME} == 'ulyssa' ] || [ ${RELEASE_CODENAME} == 'ulyssa' ] ||
[ ${RELEASE_CODENAME} == 'jammy' ] ||
[ ${RELEASE_CODENAME} == 'impish' ]; then [ ${RELEASE_CODENAME} == 'impish' ]; then
SITL_PKGS+=" python3-wxgtk4.0" SITL_PKGS+=" python3-wxgtk4.0"
SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libpng16-16 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame SITL_PKGS+=" fonts-freefont-ttf libfreetype6-dev libpng16-16 libportmidi-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev libsdl1.2-dev" # for pygame