diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2016-08-19 09:37:39 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2016-08-20 03:56:46 +0300 |
| commit | e1243339ca4dd0629ef7ae6a38b0852aa709620b (patch) | |
| tree | 95d70c8fcdfa6b29030c70b76c7689065cb941f3 /util | |
| parent | ab4d7adbb96fa034fd20364247d615f527661594 (diff) | |
| download | qmk_firmware-e1243339ca4dd0629ef7ae6a38b0852aa709620b.tar.gz qmk_firmware-e1243339ca4dd0629ef7ae6a38b0852aa709620b.zip | |
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.
Diffstat (limited to 'util')
| -rw-r--r-- | util/install_dependencies.sh | 12 |
1 files changed, 8 insertions, 4 deletions
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 | |||
| 20 | arm-none-eabi-gcc \ | 20 | arm-none-eabi-gcc \ |
| 21 | arm-none-eabi-binutils \ | 21 | arm-none-eabi-binutils \ |
| 22 | arm-none-eabi-newlib \ | 22 | arm-none-eabi-newlib \ |
| 23 | git | 23 | git \ |
| 24 | diffutils | ||
| 24 | 25 | ||
| 25 | elif [[ -n "$(type -P apt-get)" ]]; then | 26 | elif [[ -n "$(type -P apt-get)" ]]; then |
| 26 | # Debian and derivatives | 27 | # Debian and derivatives |
| @@ -47,7 +48,8 @@ elif [[ -n "$(type -P apt-get)" ]]; then | |||
| 47 | gcc-arm-none-eabi \ | 48 | gcc-arm-none-eabi \ |
| 48 | binutils-arm-none-eabi \ | 49 | binutils-arm-none-eabi \ |
| 49 | libnewlib-arm-none-eabi \ | 50 | libnewlib-arm-none-eabi \ |
| 50 | git | 51 | git \ |
| 52 | diffutils | ||
| 51 | 53 | ||
| 52 | elif [[ -n "$(type -P yum)" ]]; then | 54 | elif [[ -n "$(type -P yum)" ]]; then |
| 53 | # Fedora, CentOS or RHEL and derivatives | 55 | # Fedora, CentOS or RHEL and derivatives |
| @@ -69,7 +71,8 @@ elif [[ -n "$(type -P yum)" ]]; then | |||
| 69 | gcc-arm-none-eabi \ | 71 | gcc-arm-none-eabi \ |
| 70 | binutils-arm-none-eabi \ | 72 | binutils-arm-none-eabi \ |
| 71 | libnewlib-arm-none-eabi \ | 73 | libnewlib-arm-none-eabi \ |
| 72 | git | 74 | git \ |
| 75 | diffutils | ||
| 73 | # The listed eabi pacackes do unfortunately not exist for CentOS, | 76 | # The listed eabi pacackes do unfortunately not exist for CentOS, |
| 74 | # But at least in Fedora they do, so try to install them anyway | 77 | # But at least in Fedora they do, so try to install them anyway |
| 75 | # TODO: Build them from sources, if the installation fails | 78 | # TODO: Build them from sources, if the installation fails |
| @@ -85,7 +88,8 @@ elif [[ -n "$(type -P zypper)" ]]; then | |||
| 85 | patch \ | 88 | patch \ |
| 86 | wget \ | 89 | wget \ |
| 87 | dfu-programmer \ | 90 | dfu-programmer \ |
| 88 | git | 91 | git \ |
| 92 | diffutils | ||
| 89 | # TODO: The avr and eabi tools are not available as default packages, so we need | 93 | # TODO: The avr and eabi tools are not available as default packages, so we need |
| 90 | # another way to install them | 94 | # another way to install them |
| 91 | 95 | ||
