summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-08-19 08:37:39 +0200
committerFred Sundvik <fsundvik@gmail.com>2016-08-20 02:56:46 +0200
commite1243339ca4dd0629ef7ae6a38b0852aa709620b (patch)
tree95d70c8fcdfa6b29030c70b76c7689065cb941f3
parentab4d7adbb96fa034fd20364247d615f527661594 (diff)
downloadqmk_firmware-e1243339ca4dd0629ef7ae6a38b0852aa709620b.tar.gz
qmk_firmware-e1243339ca4dd0629ef7ae6a38b0852aa709620b.tar.xz
Add diffutils to travis.yml and install_dependencies
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.
-rw-r--r--.travis.yml1
-rw-r--r--util/install_dependencies.sh12
2 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 297cf19a6..138a2c553 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/util/install_dependencies.sh b/util/install_dependencies.sh
index 24564a2ac..49ac86e07 100644
--- a/util/install_dependencies.sh
+++ b/util/install_dependencies.sh
@@ -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
@@ -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
@@ -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
@@ -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