From 5f44327dab8947f1389e5e9f49871bccf4cc6619 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 15 May 2018 12:52:03 +1000 Subject: [PATCH] Tools: install-prereqs-ubuntu: only install realpath package if available This has been rolled into coreutils in more recent Ubuntus --- Tools/scripts/install-prereqs-ubuntu.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Tools/scripts/install-prereqs-ubuntu.sh b/Tools/scripts/install-prereqs-ubuntu.sh index 97f1ddb796..f456cb9f98 100755 --- a/Tools/scripts/install-prereqs-ubuntu.sh +++ b/Tools/scripts/install-prereqs-ubuntu.sh @@ -11,7 +11,7 @@ PX4_PKGS="python-argparse openocd flex bison libncurses5-dev \ zip genromfs python-empy cmake cmake-data" ARM_LINUX_PKGS="g++-arm-linux-gnueabihf pkg-config-arm-linux-gnueabihf" # python-wxgtk packages are added to SITL_PKGS below -SITL_PKGS="libtool libxml2-dev libxslt1-dev python-dev python-pip python-setuptools python-matplotlib python-serial python-scipy python-opencv python-numpy python-pyparsing realpath xterm" +SITL_PKGS="libtool libxml2-dev libxslt1-dev python-dev python-pip python-setuptools python-matplotlib python-serial python-scipy python-opencv python-numpy python-pyparsing xterm" ASSUME_YES=false QUIET=false @@ -86,6 +86,10 @@ else SITL_PKGS+=" python-wxgtk2.8" fi +if apt-cache search realpath; then + SITL_PKGS+=" realpath" +fi + $APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $ARM_LINUX_PKGS sudo pip2 -q install -U $PYTHON_PKGS