From 372209649cc2e413efab2715248b9ca06020e386 Mon Sep 17 00:00:00 2001 From: Pierre Kancir Date: Mon, 15 May 2023 10:24:14 +0200 Subject: [PATCH] Tools: move Debian Buster to python3 --- Tools/environment_install/install-prereqs-ubuntu.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Tools/environment_install/install-prereqs-ubuntu.sh b/Tools/environment_install/install-prereqs-ubuntu.sh index 5fc7a0eff2..edcc10ad1d 100755 --- a/Tools/environment_install/install-prereqs-ubuntu.sh +++ b/Tools/environment_install/install-prereqs-ubuntu.sh @@ -87,8 +87,8 @@ if [ ${RELEASE_CODENAME} == 'bionic' ] ; then elif [ ${RELEASE_CODENAME} == 'buster' ]; then SITLFML_VERSION="2.5" SITLCFML_VERSION="2.5" - PYTHON_V="python" - PIP=pip2 + PYTHON_V="python3" + PIP=pip3 elif [ ${RELEASE_CODENAME} == 'focal' ]; then SITLFML_VERSION="2.5" SITLCFML_VERSION="2.5" @@ -264,13 +264,16 @@ elif [ ${RELEASE_CODENAME} == 'groovy' ] || SITL_PKGS+=" libpython3-stdlib" # for argparse elif [ ${RELEASE_CODENAME} == 'lunar' ]; then SITL_PKGS+=" libpython3-stdlib" # for argparse +elif [ ${RELEASE_CODENAME} == 'buster' ]; then + SITL_PKGS+=" libpython3-stdlib" # for argparse else SITL_PKGS+=" python-argparse" fi # Check for graphical package for MAVProxy 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" elif [ ${RELEASE_CODENAME} == 'groovy' ] || [ ${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 elif [ ${RELEASE_CODENAME} == 'bullseye' ] || [ ${RELEASE_CODENAME} == 'groovy' ] || + [ ${RELEASE_CODENAME} == 'buster' ] || [ ${RELEASE_CODENAME} == 'focal' ] || [ ${RELEASE_CODENAME} == 'jammy' ]; then SITL_PKGS+=" python3-wxgtk4.0"