From 90b8893b4a134ae5fd2a7f4c77243160c745b88a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <andrew@tridgell.net>
Date: Mon, 4 Jan 2021 08:48:19 +1100
Subject: [PATCH] Tools: removed dependency on genromfs and cmake

we don't need these any more
thanks to James for noticing
---
 Tools/environment_install/install-prereqs-arch.sh   |  2 +-
 Tools/environment_install/install-prereqs-mac.sh    |  1 -
 Tools/environment_install/install-prereqs-ubuntu.sh | 11 +----------
 Tools/scripts/install-apt-ci.sh                     |  3 ---
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/Tools/environment_install/install-prereqs-arch.sh b/Tools/environment_install/install-prereqs-arch.sh
index 7d4efdd566..e4aeb842be 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 0b927ccbbf..4fb0026761 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 6bacf71208..0ebc5bda9f 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 f9b3adb52f..82a0d98bfc 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)