Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: removed dependency on genromfs and cmake

Browse Source 
we don't need these any more
thanks to James for noticing
This commit is contained in:
Andrew Tridgell 2021-01-04 08:48:19 +11:00
parent 0273d92887
commit 90b8893b4a
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ OPT="/opt"
BASE_PKGS="base-devel ccache git gsfonts tk wget" BASE_PKGS="base-devel ccache git gsfonts tk wget"
SITL_PKGS="python2-pip python-pip wxpython opencv python2-numpy python2-scipy" 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" PYTHON2_PKGS="future lxml pymavlink MAVProxy argparse matplotlib pyparsing"
PYTHON3_PKGS="pyserial empy" PYTHON3_PKGS="pyserial empy"

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

@ -13,7 +13,6 @@ xcode-select --install
brew tap ardupilot/homebrew-px4 brew tap ardupilot/homebrew-px4
brew update brew update
brew install genromfs
brew install gcc-arm-none-eabi brew install gcc-arm-none-eabi
brew install gawk brew install gawk

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

@ -90,7 +90,7 @@ else
fi fi
# Lists of packages to install # 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" PYTHON_PKGS="future lxml pymavlink MAVProxy pexpect"
# add some Python packages required for commonly-used MAVProxy modules and hex file generation: # add some Python packages required for commonly-used MAVProxy modules and hex file generation:
if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then if [[ $SKIP_AP_EXT_ENV -ne 1 ]]; then
@ -146,15 +146,6 @@ function maybe_prompt_user() {
fi 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" heading "Add user to dialout group to allow managing serial ports"
sudo usermod -a -G dialout $USER sudo usermod -a -G dialout $USER
echo "Done!" echo "Done!"

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

@ -6,15 +6,12 @@ set -ex
PKGS=" \ PKGS=" \
build-essential \ build-essential \
gawk \ gawk \
genromfs \
libc6-i386 \ libc6-i386 \
libxml2-dev \ libxml2-dev \
libxslt1-dev \ libxslt1-dev \
python-pip \ python-pip \
python-dev \ python-dev \
zlib1g-dev \ zlib1g-dev \
cmake3 \
cmake3-data \
" "
read -r UBUNTU_CODENAME <<<$(lsb_release -c -s) read -r UBUNTU_CODENAME <<<$(lsb_release -c -s)