Skip to content

Commit

Permalink
Merge pull request #389 from gwsystems/base0x10-patch-1
Browse files Browse the repository at this point in the history
Base0x10 patch 1
  • Loading branch information
gparmer authored May 13, 2020
2 parents 4ebd895 + ccccc7c commit 28d0e42
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
3 changes: 2 additions & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Tools necessary for Composite
```
sudo apt-get -y install bc
sudo apt-get -y install g++
sudo apt-get -y install gcc-multilib
sudo apt-get -y install binutils-dev
sudo apt-get -y install qemu-kvm
Expand All @@ -25,7 +26,7 @@ $ git clone /~https://github.com/gparmer/composite.git composite
$ cd composite/src/
$ make init
$ make
$ make run RUNSCRIPT=kernel_tests.sh run # microbenchmarks
$ make run RUNSCRIPT=kernel_tests.sh run # Kernel unit tests
$ make run RUNSCRIPT=unit_schedtests.sh run # simple scheduler tests
```

Expand Down
12 changes: 9 additions & 3 deletions tools/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,30 @@ Vagrant.configure(2) do |config|
config.vm.provider "virtualbox" do |v|
v.name = "composite_dev"
v.memory = 1024
v.cpus = 2
v.customize ["modifyvm", :id, "--paravirtprovider", "kvm"]
v.cpus = 4
v.customize ["modifyvm", :id, "--paravirtprovider", "kvm", "--ioapic", "on"]
end

# Disable the default syncing
config.vm.synced_folder ".", "/vagrant", disabled: true
# Instead sync the actual composite folder
config.vm.synced_folder "../", "/home/vagrant/composite"

config.vm.provision "shell", inline: <<-SHELL
config.vm.provision "shell", privileged: false, inline: <<-SHELL
sudo apt-get update
sudo apt-get -y install make
sudo apt-get -y install git
sudo apt-get -y install ntp
sudo apt-get -y install bc
sudo apt-get -y install g++
sudo apt-get -y install gcc-multilib
sudo apt-get -y install binutils-dev
sudo apt-get -y install build-essential
sudo apt-get -y install qemu-kvm
curl https://sh.rustup.rs -sSf | sh -s -- -y
source $HOME/.cargo/env
rustup default nightly
cargo install xargo
rustup component add rust-src
SHELL
end

0 comments on commit 28d0e42

Please sign in to comment.