Skip to content

Commit

Permalink
Add diffutils to travis.yml and install_dependencies
Browse files Browse the repository at this point in the history
It has been required for a while now, and now actually checked in
the makefiles. Before, if you didn't have it installed it would
just recompile everything.

The readme hasn't been updated to reflect this, I think we need
to go through that separately, and see what's really needed. Or
just instruct people to run the batch scripts.
  • Loading branch information
fredizzimo committed Aug 20, 2016
1 parent ab4d7ad commit e124333
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ addons:
- gcc-arm-none-eabi
- binutils-arm-none-eabi
- libnewlib-arm-none-eabi
- diffutils
after_success: bash util/travis_compiled_push.sh
12 changes: 8 additions & 4 deletions util/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ if [[ -n "$(type -P pacman )" ]]; then
arm-none-eabi-gcc \
arm-none-eabi-binutils \
arm-none-eabi-newlib \
git
git \
diffutils

elif [[ -n "$(type -P apt-get)" ]]; then
# Debian and derivatives
Expand All @@ -47,7 +48,8 @@ elif [[ -n "$(type -P apt-get)" ]]; then
gcc-arm-none-eabi \
binutils-arm-none-eabi \
libnewlib-arm-none-eabi \
git
git \
diffutils

elif [[ -n "$(type -P yum)" ]]; then
# Fedora, CentOS or RHEL and derivatives
Expand All @@ -69,7 +71,8 @@ elif [[ -n "$(type -P yum)" ]]; then
gcc-arm-none-eabi \
binutils-arm-none-eabi \
libnewlib-arm-none-eabi \
git
git \
diffutils
# The listed eabi pacackes do unfortunately not exist for CentOS,
# But at least in Fedora they do, so try to install them anyway
# TODO: Build them from sources, if the installation fails
Expand All @@ -85,7 +88,8 @@ elif [[ -n "$(type -P zypper)" ]]; then
patch \
wget \
dfu-programmer \
git
git \
diffutils
# TODO: The avr and eabi tools are not available as default packages, so we need
# another way to install them

Expand Down

0 comments on commit e124333

Please sign in to comment.