Browse Source

Tools: removed dependency on genromfs and cmake

we don't need these any more
thanks to James for noticing
zr-v5.1
Andrew Tridgell 4 years ago
parent
commit
90b8893b4a
  1. 2
      Tools/environment_install/install-prereqs-arch.sh
  2. 1
      Tools/environment_install/install-prereqs-mac.sh
  3. 11
      Tools/environment_install/install-prereqs-ubuntu.sh
  4. 3
      Tools/scripts/install-apt-ci.sh

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

@ -7,7 +7,7 @@ OPT="/opt" @@ -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"

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

@ -13,7 +13,6 @@ xcode-select --install @@ -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

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

@ -90,7 +90,7 @@ else @@ -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() { @@ -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!"

3
Tools/scripts/install-apt-ci.sh

@ -6,15 +6,12 @@ set -ex @@ -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)

Loading…
Cancel
Save