Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Add ChibiOS packages to the avr_setup script (#468)

Browse source 
* Add ChibiOS packages to the avr_setup script

* Add git as a dependency

* Rename avr_setup.sh -> install_dependencies.sh

Also fix the Vagrant welcome message to reflect the new directory
structure.
This commit is contained in:
fredizzimo 2016-07-02 00:22:09 +03:00 committed by Jack Humbert
parent 4d4f7684e6
commit c30aba0bce
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Vagrantfile vendored
View file

@ -78,7 +78,7 @@ Vagrant.configure(2) do |config|
# add a # before ,args: and run 'vagrant up' to get a working
# non-updated box and then attempt to troubleshoot or open a Github issue
config.vm.provision "shell", run: "always", path: "./util/avr_setup.sh", args: "-update"
config.vm.provision "shell", run: "always", path: "./util/install_dependencies.sh", args: "-update"
config.vm.post_up_message = <<-EOT
Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win)
@ -91,7 +91,7 @@ Vagrant.configure(2) do |config|
Or you can copy and paste the example line below.
cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make
cd /vagrant; cd keyboards; cd ergodox_ez; make clean; make
EOT

26
util/avr_setup.sh → util/install_dependencies.sh
View file

@ -16,7 +16,11 @@ if [[ -n "$(type -P pacman )" ]]; then
avr-gcc \
avr-binutils \
avr-libc \
dfu-util
dfu-util \
arm-none-eabi-gcc \
arm-none-eabi-binutils \
arm-none-eabi-newlib \
git
elif [[ -n "$(type -P apt-get)" ]]; then
# Debian and derivatives
@ -39,7 +43,11 @@ elif [[ -n "$(type -P apt-get)" ]]; then
binutils-avr \
avr-libc \
dfu-programmer \
dfu-util
dfu-util \
gcc-arm-none-eabi \
binutils-arm-none-eabi \
libnewlib-arm-none-eabi \
git
elif [[ -n "$(type -P yum)" ]]; then
# Fedora, CentOS or RHEL and derivatives
@ -57,7 +65,14 @@ elif [[ -n "$(type -P yum)" ]]; then
avr-gcc \
avr-libc \
dfu-programmer \
dfu-util
dfu-util \
gcc-arm-none-eabi \
binutils-arm-none-eabi \
libnewlib-arm-none-eabi \
git
# 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
elif [[ -n "$(type -P zypper)" ]]; then
# openSUSE
@ -69,6 +84,9 @@ elif [[ -n "$(type -P zypper)" ]]; then
kernel-devel \
patch \
wget \
dfu-programmer
dfu-programmer \
git
# TODO: The avr and eabi tools are not available as default packages, so we need
# another way to install them
fi