Browse Source

Tools: include install empy as prerequisite

gps-1.3.1
bugobliterator 3 years ago committed by Andrew Tridgell
parent
commit
99b53055ce
  1. 2
      Tools/environment_install/install-prereqs-mac.sh
  2. 4
      Tools/environment_install/install-prereqs-ubuntu.sh

2
Tools/environment_install/install-prereqs-mac.sh

@ -148,7 +148,7 @@ if [[ $DO_AP_STM_ENV -eq 1 ]]; then @@ -148,7 +148,7 @@ if [[ $DO_AP_STM_ENV -eq 1 ]]; then
install_arm_none_eabi_toolchain
fi
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect geocoder flake8"
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect geocoder flake8 empy"
# 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 intelhex gnureadline"

4
Tools/environment_install/install-prereqs-ubuntu.sh

@ -123,9 +123,9 @@ fi @@ -123,9 +123,9 @@ fi
BASE_PKGS="build-essential ccache g++ gawk git make wget"
if [ ${RELEASE_CODENAME} == 'xenial' ] || [ ${RELEASE_CODENAME} == 'disco' ] || [ ${RELEASE_CODENAME} == 'eoan' ]; then
# use fixed version for package that drop python2 support
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8==3.7.9 geocoder configparser==5.0.0 click==7.1.2 decorator==4.4.2"
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8==3.7.9 geocoder empy configparser==5.0.0 click==7.1.2 decorator==4.4.2"
else
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8 geocoder"
PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect flake8 geocoder empy"
fi
# add some Python packages required for commonly-used MAVProxy modules and hex file generation:

Loading…
Cancel
Save