Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tools: removed dependency on genromfs and cmake #16214

Merged
merged 1 commit into from Jan 4, 2021
Merged

Tools: removed dependency on genromfs and cmake #16214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tools/environment_install/install-prereqs-arch.sh
View file
Open in desktop
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion Tools/environment_install/install-prereqs-mac.sh
View file
Open in desktop
Expand Up @@ -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

Expand Down
11 changes: 1 addition & 10 deletions Tools/environment_install/install-prereqs-ubuntu.sh
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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!"
Expand Down
3 changes: 0 additions & 3 deletions Tools/scripts/install-apt-ci.sh
View file
Open in desktop
Expand Up @@ -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)
Expand Down