Skip to content

Commit

Permalink
vagrant provision code added
Browse files Browse the repository at this point in the history
  • Loading branch information
xc2 committed Sep 29, 2017
1 parent ae20645 commit cca48e1
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 35 deletions.
54 changes: 20 additions & 34 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

# All Vagrant configuration is done below. The "2" in Vagrant.configure
# All Vagrant configuration is done below. The '2' in Vagrant.configure
# configures the configuration version (we support older styles for
# backwards compatibility). Please don't change it unless you know what
# you're doing.
Vagrant.configure("2") do |config|
Vagrant.configure('2') do |config|
# The most common configuration options are documented and commented below.
# For a complete reference, please see the online documentation at
# https://docs.vagrantup.com.

# Every Vagrant development environment requires a box. You can search for
# boxes at https://atlas.hashicorp.com/search.
config.vm.box = "ubuntu/trusty64"
config.vm.box = 'ubuntu/trusty64'

# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs
Expand All @@ -21,52 +21,38 @@ Vagrant.configure("2") do |config|

# Create a forwarded port mapping which allows access to a specific port
# within the machine from a port on the host machine. In the example below,
# accessing "localhost:8080" will access port 80 on the guest machine.
# config.vm.network "forwarded_port", guest: 80, host: 8080
# accessing 'localhost:8080' will access port 80 on the guest machine.
# config.vm.network 'forwarded_port', guest: 80, host: 8080

# Create a private network, which allows host-only access to the machine
# using a specific IP.
# config.vm.network "private_network", ip: "192.168.33.10"
# config.vm.network 'private_network', ip: '192.168.33.10'

# Create a public network, which generally matched to bridged network.
# Bridged networks make the machine appear as another physical device on
# your network.
# config.vm.network "public_network"
# config.vm.network 'public_network'

# Share an additional folder to the guest VM. The first argument is
# the path on the host to the actual folder. The second argument is
# the path on the guest to mount the folder. And the optional third
# argument is a set of non-required options.
# config.vm.synced_folder "../data", "/vagrant_data"
# config.vm.synced_folder '../data', '/vagrant_data'

# Provider-specific configuration so you can fine-tune various
# backing providers for Vagrant. These expose provider-specific options.
# Example for VirtualBox:
#
config.vm.provider "virtualbox" do |vb|
# # Display the VirtualBox GUI when booting the machine
# vb.gui = true
#
# # Customize the amount of memory on the VM:
vb.memory = "2048"
vb.cpus = 4
end
#
# View the documentation for the provider you are using for more
# information on available options.

# Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
# such as FTP and Heroku are also available. See the documentation at
# https://docs.vagrantup.com/v2/push/atlas.html for more information.
# config.push.define "atlas" do |push|
# push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
# end

# Enable provisioning with a shell script. Additional provisioners such as
# Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
# documentation for more information about their specific syntax and use.
# config.vm.provision "shell", inline: <<-SHELL
# apt-get update
# apt-get install -y apache2
# SHELL
config.vm.provider 'virtualbox' do |vb|
# Display the VirtualBox GUI when booting the machine
# vb.gui = true
#
# Customize the amount of memory on the VM:
vb.memory = '2048'
vb.cpus = 4
end

config.vm.provision 'chef_solo' do |chef|
chef.add_recipe('init')
end
end
25 changes: 25 additions & 0 deletions cookbooks/init/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
directory '/home/vagrant/CACHE' do
owner 'vagrant'
group 'vagrant'
mode 0755
action :create
end

execute 'dpkg --add-architecture i386'

apt_update 'update' do
action :periodic
end

package %w(
build-essential
gcc-multilib
lib32z1
lib32ncurses5
lib32bz2-1.0
lib32stdc++6
libtool
autoconf
git
libelf1:i386
)
2 changes: 1 addition & 1 deletion toolchain.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- mode: makefile -*-
TOOLCHAIN := mipsel
MERLIN_VERSION := 380.62_1
MERLIN_VERSION := 380.68_2
MERLIN_TARBALL = $(CACHEROOT)/merlin-$(MERLIN_VERSION).tar.gz

$(MERLIN_TARBALL):
Expand Down

0 comments on commit cca48e1

Please sign in to comment.