From e704e84bf92d4db936b5547565538431d467a3fb Mon Sep 17 00:00:00 2001 From: Pierre Kancir Date: Thu, 10 Mar 2022 21:46:20 +0100 Subject: [PATCH] Tools: fix package install on Python2 --- Tools/environment_install/install-prereqs-ubuntu.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Tools/environment_install/install-prereqs-ubuntu.sh b/Tools/environment_install/install-prereqs-ubuntu.sh index 67287065d6..c4feae6d05 100755 --- a/Tools/environment_install/install-prereqs-ubuntu.sh +++ b/Tools/environment_install/install-prereqs-ubuntu.sh @@ -138,7 +138,11 @@ fi # add some Python packages required for commonly-used MAVProxy modules and hex file generation: if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then - PYTHON_PKGS="$PYTHON_PKGS pygame intelhex" + if [ ${RELEASE_CODENAME} == 'xenial' ] || [ ${RELEASE_CODENAME} == 'disco' ] || [ ${RELEASE_CODENAME} == 'eoan' ]; then + PYTHON_PKGS="$PYTHON_PKGS pygame==2.0.3 intelhex" + else + PYTHON_PKGS="$PYTHON_PKGS pygame intelhex" + fi fi ARM_LINUX_PKGS="g++-arm-linux-gnueabihf $INSTALL_PKG_CONFIG" # python-wxgtk packages are added to SITL_PKGS below