diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | util/install_dependencies.sh | 12 |
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: | |||
| 21 | - gcc-arm-none-eabi | 21 | - gcc-arm-none-eabi |
| 22 | - binutils-arm-none-eabi | 22 | - binutils-arm-none-eabi |
| 23 | - libnewlib-arm-none-eabi | 23 | - libnewlib-arm-none-eabi |
| 24 | - diffutils | ||
| 24 | after_success: bash util/travis_compiled_push.sh | 25 | 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 | |||
| 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 | ||
