Merge pull request #55 from dierbei/op-feature

kuasar-io · Nov 8, 2023 · ef6a9e2 · ef6a9e2
2 parents 46630cf + b111fc9
commit ef6a9e2
Show file tree

Hide file tree

Showing 18 changed files with 476 additions and 440 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 .idea
-bin
+/bin
 .vscode
 target
 **/src/api/*

diff --git a/Makefile b/Makefile
@@ -15,8 +15,8 @@ SYSTEMD_CONF_DIR := /etc/sysconfig
 all: vmm quark wasm
 
 bin/vmm-sandboxer:
-	@cd vmm/sandbox && cargo build --release --features=${HYPERVISOR}
-	@mkdir -p bin && cp vmm/sandbox/target/release/vmm-sandboxer bin/vmm-sandboxer
+	@cd vmm/sandbox && cargo build --release --bin ${HYPERVISOR}
+	@mkdir -p bin && cp vmm/sandbox/target/release/${HYPERVISOR} bin/vmm-sandboxer
 
 bin/vmm-task:
 	@cd vmm/task && cargo build --release --target=${ARCH}-unknown-linux-musl

diff --git a/quark/Cargo.lock b/quark/Cargo.lock
-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     .idea
-    bin
+    /bin
     .vscode
     target
     **/src/api/*
@@ Expand Down @@