diff options
author | IBNobody <ibnobody@gmail.com> | 2016-08-28 18:50:06 -0500 |
---|---|---|
committer | IBNobody <ibnobody@gmail.com> | 2016-08-28 18:50:06 -0500 |
commit | 6da0eb2b2b70d7b2c5bb1f7c6898f7d9a275ceea (patch) | |
tree | 50cd382df7dac58057c958f62732174cf0dfe920 /util/install_dependencies.sh | |
parent | 9263ade0fbdde6431fb5c7f26970754c5c7c2963 (diff) | |
parent | 6d1e916851daa7bcbd8ef31b6fbc73cb369ef1f0 (diff) |
Merge remote-tracking branch 'refs/remotes/jackhumbert/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 24564a2ac5..49ac86e072 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 |