mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-22 08:38:36 -04:00
Tools: move Debian Buster to python3
This commit is contained in:
parent
39eb7072e1
commit
372209649c
@ -87,8 +87,8 @@ if [ ${RELEASE_CODENAME} == 'bionic' ] ; then
|
|||||||
elif [ ${RELEASE_CODENAME} == 'buster' ]; then
|
elif [ ${RELEASE_CODENAME} == 'buster' ]; then
|
||||||
SITLFML_VERSION="2.5"
|
SITLFML_VERSION="2.5"
|
||||||
SITLCFML_VERSION="2.5"
|
SITLCFML_VERSION="2.5"
|
||||||
PYTHON_V="python"
|
PYTHON_V="python3"
|
||||||
PIP=pip2
|
PIP=pip3
|
||||||
elif [ ${RELEASE_CODENAME} == 'focal' ]; then
|
elif [ ${RELEASE_CODENAME} == 'focal' ]; then
|
||||||
SITLFML_VERSION="2.5"
|
SITLFML_VERSION="2.5"
|
||||||
SITLCFML_VERSION="2.5"
|
SITLCFML_VERSION="2.5"
|
||||||
@ -264,13 +264,16 @@ elif [ ${RELEASE_CODENAME} == 'groovy' ] ||
|
|||||||
SITL_PKGS+=" libpython3-stdlib" # for argparse
|
SITL_PKGS+=" libpython3-stdlib" # for argparse
|
||||||
elif [ ${RELEASE_CODENAME} == 'lunar' ]; then
|
elif [ ${RELEASE_CODENAME} == 'lunar' ]; then
|
||||||
SITL_PKGS+=" libpython3-stdlib" # for argparse
|
SITL_PKGS+=" libpython3-stdlib" # for argparse
|
||||||
|
elif [ ${RELEASE_CODENAME} == 'buster' ]; then
|
||||||
|
SITL_PKGS+=" libpython3-stdlib" # for argparse
|
||||||
else
|
else
|
||||||
SITL_PKGS+=" python-argparse"
|
SITL_PKGS+=" python-argparse"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for graphical package for MAVProxy
|
# Check for graphical package for MAVProxy
|
||||||
if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
|
if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
|
||||||
if [ ${RELEASE_CODENAME} == 'bullseye' ]; then
|
if [ ${RELEASE_CODENAME} == 'bullseye' ] ||
|
||||||
|
[ ${RELEASE_CODENAME} == 'buster' ]; then
|
||||||
SITL_PKGS+=" libjpeg62-turbo-dev"
|
SITL_PKGS+=" libjpeg62-turbo-dev"
|
||||||
elif [ ${RELEASE_CODENAME} == 'groovy' ] ||
|
elif [ ${RELEASE_CODENAME} == 'groovy' ] ||
|
||||||
[ ${RELEASE_CODENAME} == 'focal' ]; then
|
[ ${RELEASE_CODENAME} == 'focal' ]; then
|
||||||
@ -293,6 +296,7 @@ if [[ $SKIP_AP_GRAPHIC_ENV -ne 1 ]]; then
|
|||||||
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
|
||||||
elif [ ${RELEASE_CODENAME} == 'bullseye' ] ||
|
elif [ ${RELEASE_CODENAME} == 'bullseye' ] ||
|
||||||
[ ${RELEASE_CODENAME} == 'groovy' ] ||
|
[ ${RELEASE_CODENAME} == 'groovy' ] ||
|
||||||
|
[ ${RELEASE_CODENAME} == 'buster' ] ||
|
||||||
[ ${RELEASE_CODENAME} == 'focal' ] ||
|
[ ${RELEASE_CODENAME} == 'focal' ] ||
|
||||||
[ ${RELEASE_CODENAME} == 'jammy' ]; then
|
[ ${RELEASE_CODENAME} == 'jammy' ]; then
|
||||||
SITL_PKGS+=" python3-wxgtk4.0"
|
SITL_PKGS+=" python3-wxgtk4.0"
|
||||||
|
Loading…
Reference in New Issue
Block a user