From b36e532b5e0eef219f33075e6e60b68d104484ee Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 4 Jun 2016 00:10:47 -0400 Subject: cleans up folder structure * consolidates docs * deletes converter/ * updates .md references (most) --- Vagrantfile | 88 ------------------------------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 Vagrantfile (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 1abe8ff3b..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,88 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure(2) do |config| - # You can only have one config.vm.box uncommented at a time - - # Comment this and uncomment another if you don't want to use the minimal Arch box - config.vm.box = "dragon788/arch-ala-elasticdog" - - # VMware/Virtualbox 64 bit - # config.vm.box = "phusion/ubuntu-14.04-amd64" - # - # VMware/Virtualbox 64 bit - #config.vm.box = "puphpet/centos65-x64" - # - # The opensuse boxes don't have dfu-util in their default repositories - # - # The virtualbox version has tools issues - # VMware/Virtualbox 64 bit - #config.vm.box = "bento/opensuse-13.2-x86_64" - # - # Virtualbox only - #config.vm.box = "bento/opensuse-13.2-i386" - # config.vm.box = "" - # config.vm.box = "" - - # This section allows you to customize the Virtualbox VM - # settings, ie showing the GUI or upping the memory - # or cores if desired - config.vm.provider "virtualbox" do |vb| - # Hide the VirtualBox GUI when booting the machine - vb.gui = false - # Uncomment the below lines if you want to program - # your Teensy via the VM rather than your host OS - #vb.customize ['modifyvm', :id, '--usb', 'on'] - #vb.customize ['usbfilter', 'add', '0', - # '--target', :id, - # '--name', 'teensy', - # '--vendorid', '0x16c0', - # '--productid','0x0478' - # ] - # Customize the amount of memory on the VM: - vb.memory = "512" - end - - # This section allows you to customize the VMware VM - # settings, ie showing the GUI or upping the memory - # or cores if desired - config.vm.provider "vmware_workstation" do |vmw| - # Hide the VMware GUI when booting the machine - vmw.gui = false - - # Customize the amount of memory on the VM: - vmw.memory = "512" - end - - config.vm.provider "vmware_fusion" do |vmf| - # Hide the vmfare GUI when booting the machine - vmf.gui = false - - # Customize the amount of memory on the VM: - vmf.memory = "512" - end - - # This script ensures the required packages for AVR programming are installed - # It also ensures the system always gets the latest updates when powered on - # If this causes issues you can run a 'vagrant destroy' and then - # 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: "avr_setup.sh", args: "-update" - - config.vm.post_up_message = """ - Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win) - or 'vagrant ssh-config' and Putty or Bitvise SSH or another SSH tool - - Change directory (cd) to the keyboard you wish to program - (Optionally) modify your layout, - then run 'make clean' - and then 'make' to compile the .eep and .hex files. - - Or you can copy and paste the example line below. - - cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make - - - """ -end -- cgit v1.2.3-70-g09d2 From 8ca1831daae0ddba7413972df97b846ef5d94f19 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 4 Jun 2016 13:18:15 -0400 Subject: makes vagrant usable again --- Vagrantfile | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/VAGRANT_GUIDE.md | 2 +- util/Vagrantfile | 88 ---------------------------------------------------- 3 files changed, 89 insertions(+), 89 deletions(-) create mode 100644 Vagrantfile delete mode 100644 util/Vagrantfile (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 000000000..1abe8ff3b --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,88 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + # You can only have one config.vm.box uncommented at a time + + # Comment this and uncomment another if you don't want to use the minimal Arch box + config.vm.box = "dragon788/arch-ala-elasticdog" + + # VMware/Virtualbox 64 bit + # config.vm.box = "phusion/ubuntu-14.04-amd64" + # + # VMware/Virtualbox 64 bit + #config.vm.box = "puphpet/centos65-x64" + # + # The opensuse boxes don't have dfu-util in their default repositories + # + # The virtualbox version has tools issues + # VMware/Virtualbox 64 bit + #config.vm.box = "bento/opensuse-13.2-x86_64" + # + # Virtualbox only + #config.vm.box = "bento/opensuse-13.2-i386" + # config.vm.box = "" + # config.vm.box = "" + + # This section allows you to customize the Virtualbox VM + # settings, ie showing the GUI or upping the memory + # or cores if desired + config.vm.provider "virtualbox" do |vb| + # Hide the VirtualBox GUI when booting the machine + vb.gui = false + # Uncomment the below lines if you want to program + # your Teensy via the VM rather than your host OS + #vb.customize ['modifyvm', :id, '--usb', 'on'] + #vb.customize ['usbfilter', 'add', '0', + # '--target', :id, + # '--name', 'teensy', + # '--vendorid', '0x16c0', + # '--productid','0x0478' + # ] + # Customize the amount of memory on the VM: + vb.memory = "512" + end + + # This section allows you to customize the VMware VM + # settings, ie showing the GUI or upping the memory + # or cores if desired + config.vm.provider "vmware_workstation" do |vmw| + # Hide the VMware GUI when booting the machine + vmw.gui = false + + # Customize the amount of memory on the VM: + vmw.memory = "512" + end + + config.vm.provider "vmware_fusion" do |vmf| + # Hide the vmfare GUI when booting the machine + vmf.gui = false + + # Customize the amount of memory on the VM: + vmf.memory = "512" + end + + # This script ensures the required packages for AVR programming are installed + # It also ensures the system always gets the latest updates when powered on + # If this causes issues you can run a 'vagrant destroy' and then + # 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: "avr_setup.sh", args: "-update" + + config.vm.post_up_message = """ + Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win) + or 'vagrant ssh-config' and Putty or Bitvise SSH or another SSH tool + + Change directory (cd) to the keyboard you wish to program + (Optionally) modify your layout, + then run 'make clean' + and then 'make' to compile the .eep and .hex files. + + Or you can copy and paste the example line below. + + cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make + + + """ +end diff --git a/doc/VAGRANT_GUIDE.md b/doc/VAGRANT_GUIDE.md index 2127347d9..f7419ccda 100644 --- a/doc/VAGRANT_GUIDE.md +++ b/doc/VAGRANT_GUIDE.md @@ -4,7 +4,7 @@ This project includes a Vagrantfile that will allow you to build a new firmware ## Requirements -Using the `/util/Vagrantfile` in this repository requires you have [Vagrant](http://www.vagrantup.com/) as well as [VirtualBox](https://www.virtualbox.org/) (or [VMware Workstation](https://www.vmware.com/products/workstation) and [Vagrant VMware plugin](http://www.vagrantup.com/vmware) but the (paid) VMware plugin requires a licensed copy of VMware Workstation/Fusion). +Using the `/Vagrantfile` in this repository requires you have [Vagrant](http://www.vagrantup.com/) as well as [VirtualBox](https://www.virtualbox.org/) (or [VMware Workstation](https://www.vmware.com/products/workstation) and [Vagrant VMware plugin](http://www.vagrantup.com/vmware) but the (paid) VMware plugin requires a licensed copy of VMware Workstation/Fusion). *COMPATIBILITY NOTICE* Certain versions of Virtualbox 5 appear to have an incompatibility with the Virtualbox extensions installed in the boxes in this Vagrantfile. If you encounter any issues with the /vagrant mount not succeeding, please upgrade your version of Virtualbox to at least 5.0.12. diff --git a/util/Vagrantfile b/util/Vagrantfile deleted file mode 100644 index 1abe8ff3b..000000000 --- a/util/Vagrantfile +++ /dev/null @@ -1,88 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure(2) do |config| - # You can only have one config.vm.box uncommented at a time - - # Comment this and uncomment another if you don't want to use the minimal Arch box - config.vm.box = "dragon788/arch-ala-elasticdog" - - # VMware/Virtualbox 64 bit - # config.vm.box = "phusion/ubuntu-14.04-amd64" - # - # VMware/Virtualbox 64 bit - #config.vm.box = "puphpet/centos65-x64" - # - # The opensuse boxes don't have dfu-util in their default repositories - # - # The virtualbox version has tools issues - # VMware/Virtualbox 64 bit - #config.vm.box = "bento/opensuse-13.2-x86_64" - # - # Virtualbox only - #config.vm.box = "bento/opensuse-13.2-i386" - # config.vm.box = "" - # config.vm.box = "" - - # This section allows you to customize the Virtualbox VM - # settings, ie showing the GUI or upping the memory - # or cores if desired - config.vm.provider "virtualbox" do |vb| - # Hide the VirtualBox GUI when booting the machine - vb.gui = false - # Uncomment the below lines if you want to program - # your Teensy via the VM rather than your host OS - #vb.customize ['modifyvm', :id, '--usb', 'on'] - #vb.customize ['usbfilter', 'add', '0', - # '--target', :id, - # '--name', 'teensy', - # '--vendorid', '0x16c0', - # '--productid','0x0478' - # ] - # Customize the amount of memory on the VM: - vb.memory = "512" - end - - # This section allows you to customize the VMware VM - # settings, ie showing the GUI or upping the memory - # or cores if desired - config.vm.provider "vmware_workstation" do |vmw| - # Hide the VMware GUI when booting the machine - vmw.gui = false - - # Customize the amount of memory on the VM: - vmw.memory = "512" - end - - config.vm.provider "vmware_fusion" do |vmf| - # Hide the vmfare GUI when booting the machine - vmf.gui = false - - # Customize the amount of memory on the VM: - vmf.memory = "512" - end - - # This script ensures the required packages for AVR programming are installed - # It also ensures the system always gets the latest updates when powered on - # If this causes issues you can run a 'vagrant destroy' and then - # 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: "avr_setup.sh", args: "-update" - - config.vm.post_up_message = """ - Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win) - or 'vagrant ssh-config' and Putty or Bitvise SSH or another SSH tool - - Change directory (cd) to the keyboard you wish to program - (Optionally) modify your layout, - then run 'make clean' - and then 'make' to compile the .eep and .hex files. - - Or you can copy and paste the example line below. - - cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make - - - """ -end -- cgit v1.2.3-70-g09d2 From b46f343de781a88dfe72d66246964c47e2000f49 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 4 Jun 2016 13:24:25 -0400 Subject: updates vagrant script path --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile index 1abe8ff3b..49163aea8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -68,7 +68,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: "avr_setup.sh", args: "-update" + config.vm.provision "shell", run: "always", path: "util/avr_setup.sh", args: "-update" config.vm.post_up_message = """ Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win) -- cgit v1.2.3-70-g09d2 From 83c52c6009c6b540fcf9288004ac4ae896f4ac7b Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 4 Jun 2016 13:30:11 -0400 Subject: corrects vagrant script path from @b46f343 --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile index 49163aea8..c44eaf2d6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -68,7 +68,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/avr_setup.sh", args: "-update" config.vm.post_up_message = """ Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win) -- cgit v1.2.3-70-g09d2 From fd454e5b74bc0a87effd755986ce33bf05b4d27c Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Tue, 7 Jun 2016 12:41:55 -0400 Subject: Add support for vagrant-docker (#389) * clean trailing ws in Vagrantfile and util/avr_setup.sh * replace triple quotes with heredoc. Ruby doesn't have triple quotes; that's a Python thing. This was just being parsed as multiple strings concatenated. * add docker support to Vagrantfile * make wants to find dfu-programmer in vagrant guest --- Vagrantfile | 186 ++++++++++++++++++++++++++++-------------------------- util/avr_setup.sh | 4 +- 2 files changed, 101 insertions(+), 89 deletions(-) (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile index c44eaf2d6..a6c3afd38 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,88 +1,98 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure(2) do |config| - # You can only have one config.vm.box uncommented at a time - - # Comment this and uncomment another if you don't want to use the minimal Arch box - config.vm.box = "dragon788/arch-ala-elasticdog" - - # VMware/Virtualbox 64 bit - # config.vm.box = "phusion/ubuntu-14.04-amd64" - # - # VMware/Virtualbox 64 bit - #config.vm.box = "puphpet/centos65-x64" - # - # The opensuse boxes don't have dfu-util in their default repositories - # - # The virtualbox version has tools issues - # VMware/Virtualbox 64 bit - #config.vm.box = "bento/opensuse-13.2-x86_64" - # - # Virtualbox only - #config.vm.box = "bento/opensuse-13.2-i386" - # config.vm.box = "" - # config.vm.box = "" - - # This section allows you to customize the Virtualbox VM - # settings, ie showing the GUI or upping the memory - # or cores if desired - config.vm.provider "virtualbox" do |vb| - # Hide the VirtualBox GUI when booting the machine - vb.gui = false - # Uncomment the below lines if you want to program - # your Teensy via the VM rather than your host OS - #vb.customize ['modifyvm', :id, '--usb', 'on'] - #vb.customize ['usbfilter', 'add', '0', - # '--target', :id, - # '--name', 'teensy', - # '--vendorid', '0x16c0', - # '--productid','0x0478' - # ] - # Customize the amount of memory on the VM: - vb.memory = "512" - end - - # This section allows you to customize the VMware VM - # settings, ie showing the GUI or upping the memory - # or cores if desired - config.vm.provider "vmware_workstation" do |vmw| - # Hide the VMware GUI when booting the machine - vmw.gui = false - - # Customize the amount of memory on the VM: - vmw.memory = "512" - end - - config.vm.provider "vmware_fusion" do |vmf| - # Hide the vmfare GUI when booting the machine - vmf.gui = false - - # Customize the amount of memory on the VM: - vmf.memory = "512" - end - - # This script ensures the required packages for AVR programming are installed - # It also ensures the system always gets the latest updates when powered on - # If this causes issues you can run a 'vagrant destroy' and then - # 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.post_up_message = """ - Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win) - or 'vagrant ssh-config' and Putty or Bitvise SSH or another SSH tool - - Change directory (cd) to the keyboard you wish to program - (Optionally) modify your layout, - then run 'make clean' - and then 'make' to compile the .eep and .hex files. - - Or you can copy and paste the example line below. - - cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make - - - """ -end +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + # You can only have one config.vm.box uncommented at a time + + # Comment this and uncomment another if you don't want to use the minimal Arch box + config.vm.box = "dragon788/arch-ala-elasticdog" + + # VMware/Virtualbox 64 bit + # config.vm.box = "phusion/ubuntu-14.04-amd64" + # + # VMware/Virtualbox 64 bit + #config.vm.box = "puphpet/centos65-x64" + # + # The opensuse boxes don't have dfu-util in their default repositories + # + # The virtualbox version has tools issues + # VMware/Virtualbox 64 bit + #config.vm.box = "bento/opensuse-13.2-x86_64" + # + # Virtualbox only + #config.vm.box = "bento/opensuse-13.2-i386" + # config.vm.box = "" + # config.vm.box = "" + + # This section allows you to customize the Virtualbox VM + # settings, ie showing the GUI or upping the memory + # or cores if desired + config.vm.provider "virtualbox" do |vb| + # Hide the VirtualBox GUI when booting the machine + vb.gui = false + # Uncomment the below lines if you want to program + # your Teensy via the VM rather than your host OS + #vb.customize ['modifyvm', :id, '--usb', 'on'] + #vb.customize ['usbfilter', 'add', '0', + # '--target', :id, + # '--name', 'teensy', + # '--vendorid', '0x16c0', + # '--productid','0x0478' + # ] + # Customize the amount of memory on the VM: + vb.memory = "512" + end + + # This section allows you to customize the VMware VM + # settings, ie showing the GUI or upping the memory + # or cores if desired + config.vm.provider "vmware_workstation" do |vmw| + # Hide the VMware GUI when booting the machine + vmw.gui = false + + # Customize the amount of memory on the VM: + vmw.memory = "512" + end + + config.vm.provider "vmware_fusion" do |vmf| + # Hide the vmfare GUI when booting the machine + vmf.gui = false + + # Customize the amount of memory on the VM: + vmf.memory = "512" + end + + # Docker provider pulls from hub.docker.com respecting docker.image if + # config.vm.box is nil. Note that this bind-mounts from the current dir to + # /vagrant in the guest, so unless your UID is 1000 to match vagrant in the + # image, you'll need to: chmod -R a+rw . + config.vm.provider "docker" do |docker, override| + override.vm.box = nil + docker.image = "jesselang/debian-vagrant:jessie" + docker.has_ssh = true + end + + # This script ensures the required packages for AVR programming are installed + # It also ensures the system always gets the latest updates when powered on + # If this causes issues you can run a 'vagrant destroy' and then + # 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.post_up_message = <<-EOT + Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win) + or 'vagrant ssh-config' and Putty or Bitvise SSH or another SSH tool + + Change directory (cd) to the keyboard you wish to program + (Optionally) modify your layout, + then run 'make clean' + and then 'make' to compile the .eep and .hex files. + + Or you can copy and paste the example line below. + + cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make + + + EOT +end diff --git a/util/avr_setup.sh b/util/avr_setup.sh index 34a8a3281..916d0378b 100644 --- a/util/avr_setup.sh +++ b/util/avr_setup.sh @@ -38,8 +38,9 @@ elif [[ -n "$(type -P apt-get)" ]]; then gcc-avr \ binutils-avr \ avr-libc \ + dfu-programmer \ dfu-util - + elif [[ -n "$(type -P yum)" ]]; then # Fedora, CentOS or RHEL and derivatives yum -y makecache && yum -y update @@ -55,6 +56,7 @@ elif [[ -n "$(type -P yum)" ]]; then avr-binutils \ avr-gcc \ avr-libc \ + dfu-programmer \ dfu-util elif [[ -n "$(type -P zypper)" ]]; then -- cgit v1.2.3-70-g09d2