diff --git a/Tools/environment_install/install-prereqs-arch.sh b/Tools/environment_install/install-prereqs-arch.sh index 7d4efdd566caa..e4aeb842be10c 100755 --- a/Tools/environment_install/install-prereqs-arch.sh +++ b/Tools/environment_install/install-prereqs-arch.sh @@ -7,7 +7,7 @@ OPT="/opt" BASE_PKGS="base-devel ccache git gsfonts tk wget" SITL_PKGS="python2-pip python-pip wxpython opencv python2-numpy python2-scipy" -PX4_PKGS="lib32-glibc zip zlib ncurses cmake" +PX4_PKGS="lib32-glibc zip zlib ncurses" PYTHON2_PKGS="future lxml pymavlink MAVProxy argparse matplotlib pyparsing" PYTHON3_PKGS="pyserial empy" diff --git a/Tools/environment_install/install-prereqs-mac.sh b/Tools/environment_install/install-prereqs-mac.sh index 0b927ccbbfcf1..4fb0026761c13 100755 --- a/Tools/environment_install/install-prereqs-mac.sh +++ b/Tools/environment_install/install-prereqs-mac.sh @@ -13,7 +13,6 @@ xcode-select --install brew tap ardupilot/homebrew-px4 brew update -brew install genromfs brew install gcc-arm-none-eabi brew install gawk diff --git a/Tools/environment_install/install-prereqs-ubuntu.sh b/Tools/environment_install/install-prereqs-ubuntu.sh index 6bacf7120836e..0ebc5bda9f8c2 100755 --- a/Tools/environment_install/install-prereqs-ubuntu.sh +++ b/Tools/environment_install/install-prereqs-ubuntu.sh @@ -90,7 +90,7 @@ else fi # Lists of packages to install -BASE_PKGS="build-essential ccache g++ gawk git make wget cmake" +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 and hex file generation: if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then @@ -146,15 +146,6 @@ function maybe_prompt_user() { fi } -# possibly grab a newer cmake for older ubuntu releases -if [ ${RELEASE_CODENAME} == "precise" ]; then - sudo add-apt-repository ppa:george-edison55/precise-backports -y - $APT_GET update -elif [ ${RELEASE_CODENAME} == "trusty" ]; then - sudo add-apt-repository ppa:george-edison55/cmake-3.x -y - $APT_GET update -fi - heading "Add user to dialout group to allow managing serial ports" sudo usermod -a -G dialout $USER echo "Done!" diff --git a/Tools/scripts/install-apt-ci.sh b/Tools/scripts/install-apt-ci.sh index f9b3adb52fba5..82a0d98bfc019 100755 --- a/Tools/scripts/install-apt-ci.sh +++ b/Tools/scripts/install-apt-ci.sh @@ -6,15 +6,12 @@ set -ex PKGS=" \ build-essential \ gawk \ - genromfs \ libc6-i386 \ libxml2-dev \ libxslt1-dev \ python-pip \ python-dev \ zlib1g-dev \ - cmake3 \ - cmake3-data \ " read -r UBUNTU_CODENAME <<<$(lsb_release -c -s)