diff options
| author | coderkun <olli@coderkun.de> | 2016-10-02 10:04:29 +0200 |
|---|---|---|
| committer | coderkun <olli@coderkun.de> | 2016-10-02 10:04:29 +0200 |
| commit | 8655677584483e46d9b45873aa50ec6e860486dd (patch) | |
| tree | 3f1037d47607fd40be82fe9169795978f8f3551f /util/install_dependencies.sh | |
| parent | a10e100bd5e8bad73e1b04f54639a4cec36e4b9e (diff) | |
| parent | 35e6870e5c8943c044187256e01c96ef400ca067 (diff) | |
| download | qmk_firmware-8655677584483e46d9b45873aa50ec6e860486dd.tar.gz qmk_firmware-8655677584483e46d9b45873aa50ec6e860486dd.zip | |
Merge branch 'master' into coderkun_neo2
Diffstat (limited to 'util/install_dependencies.sh')
| -rwxr-xr-x[-rw-r--r--] | util/install_dependencies.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/util/install_dependencies.sh b/util/install_dependencies.sh index 24564a2ac5..936a865938 100644..100755 --- 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 @@ -66,10 +68,10 @@ elif [[ -n "$(type -P yum)" ]]; then avr-libc \ dfu-programmer \ dfu-util \ - gcc-arm-none-eabi \ - binutils-arm-none-eabi \ - libnewlib-arm-none-eabi \ - git + arm-none-eabi-gcc-cs \ + arm-none-eabi-newlib \ + 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 +87,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 |