Skip to content

Base0x10 patch 1 #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 13, 2020
Merged

Base0x10 patch 1 #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
517fe2c
Update README.md with missing deps
base0x10 Sep 19, 2019
e998170
Update Vagrantfile to pass correct flags to vmm
base0x10 Sep 19, 2019
acb0e49
Add missing deps to vm provision script
base0x10 Sep 19, 2019
3cc6506
Update documentation on running tests/microbooter
base0x10 Sep 19, 2019
8747dac
Merge branch 'ppos' into base0x10-patch-1
gparmer Mar 8, 2020
ff6f834
Swith vagrant provision script from super user to user
base0x10 Apr 15, 2020
ccccc7c
Merge pull request #400 from base0x10/base0x10-patch-1
base0x10 Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion doc/README.md
View file
Open in desktop
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
View file
Open in desktop
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