diff options
| author |  Callum Oakley <c.oakley108@gmail.com> | 2016-09-01 17:55:00 +0100 |
|---|---|---|
| committer | Callum Oakley <c.oakley108@gmail.com> | 2016-09-01 17:55:00 +0100 |
| commit | 9c3193f22555119eb15f63f5ae5efe45e6d7358c (patch) | |
| tree | a0dcfb3ed442c12a66b444c4c579711660c30657 /util/install_dependencies.sh | |
| parent | 993d72b11fca8d50296570dc85e9354f8045c4a6 (diff) | |
| parent | e28d151a8a1d458f3c18897c6095decc17b0c3a1 (diff) | |
| download | qmk_firmware-9c3193f22555119eb15f63f5ae5efe45e6d7358c.tar.gz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'util/install_dependencies.sh')
| -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 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 |