summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorJoshua T <joshua@sonofone.net>2016-09-01 07:40:46 -0500
committerJoshua T <joshua@sonofone.net>2016-09-01 07:40:46 -0500
commit5520b0022fc6cd3dff805eb31ed4bb7e4385ee2a (patch)
tree0346d24fd7a8905486a687c68084af25022c4312 /util
parentb0c3d596816c178ccd94738a3866a08b71027d0d (diff)
parente28d151a8a1d458f3c18897c6095decc17b0c3a1 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'util')
-rw-r--r--util/install_dependencies.sh12
-rw-r--r--util/travis_compiled_push.sh4
2 files changed, 10 insertions, 6 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
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index c2a994ef02..f432976d03 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -7,7 +7,7 @@ rev=$(git rev-parse --short HEAD)
git config --global user.name "Travis CI"
git config --global user.email "jack.humb+travis.ci@gmail.com"
-make all-keymaps keyboard=ergodox/ez AUTOGEN=true
+make ergodox-ez AUTOGEN=true
find . -name ".build" | xargs rm -rf
cd ..
@@ -24,4 +24,4 @@ cp ../qmk_firmware/readme.md qmk_readme.md
git add -A
git commit -m "generated from qmk_firmware/$TRAVIS_BRANCH@${rev}"
-git push \ No newline at end of file
+git push