From d82b29b23db09bef37764276f88f74f649688e1d Mon Sep 17 00:00:00 2001 From: Henry Wurzburg Date: Mon, 20 Jan 2020 22:13:01 -0600 Subject: [PATCH] Tools:Add intelhex for python2 to let WAF build the hex files --- Tools/environment_install/install-prereqs-ubuntu.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tools/environment_install/install-prereqs-ubuntu.sh b/Tools/environment_install/install-prereqs-ubuntu.sh index 9359981436..90efd6d0b4 100755 --- a/Tools/environment_install/install-prereqs-ubuntu.sh +++ b/Tools/environment_install/install-prereqs-ubuntu.sh @@ -26,8 +26,8 @@ fi BASE_PKGS="build-essential ccache g++ gawk git make wget" PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect" -# add some Python packages required for commonly-used MAVProxy modules: -PYTHON_PKGS="$PYTHON_PKGS pygame" +# add some Python packages required for commonly-used MAVProxy modules and hex file generation: +PYTHON_PKGS="$PYTHON_PKGS pygame intelhex" PX4_PKGS="python-argparse openocd flex bison libncurses5-dev \ autoconf texinfo libftdi-dev zlib1g-dev \ zip genromfs python-empy cmake cmake-data" @@ -124,6 +124,7 @@ fi $APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $ARM_LINUX_PKGS pip2 -q install --user -U $PYTHON_PKGS + if [ ! -d $OPT/$ARM_ROOT ]; then ( cd $OPT;