Skip to content

Commit

Permalink
vmm: support youki when create container in vm
Browse files Browse the repository at this point in the history
Signed-off-by: Abel Feng <[email protected]>
  • Loading branch information
abel-von committed Oct 31, 2024
1 parent 983ee03 commit 59b1f12
Show file tree
Hide file tree
Showing 10 changed files with 1,330 additions and 263 deletions.
12 changes: 10 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ INSTALL_DIR := /var/lib/kuasar
BIN_DIR := /usr/local/bin
SYSTEMD_SERVICE_DIR := /usr/lib/systemd/system
SYSTEMD_CONF_DIR := /etc/sysconfig
ENABLE_YOUKI ?= false
RUNC_FEATURES =
VMM_TASK_FEATURES =

ifeq ($(ENABLE_YOUKI), true)
RUNC_FEATURES = youki
VMM_TASK_FEATURES = youki
endif

.PHONY: vmm wasm quark clean all install-vmm install-wasm install-quark install \
bin/vmm-sandboxer bin/vmm-task bin/vmlinux.bin bin/kuasar.img bin/kuasar.initrd \
Expand All @@ -21,7 +29,7 @@ bin/vmm-sandboxer:
@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
@cd vmm/task && cargo build --release --target=${ARCH}-unknown-linux-musl --features=${VMM_TASK_FEATURES}
@mkdir -p bin && cp vmm/task/target/${ARCH}-unknown-linux-musl/release/vmm-task bin/vmm-task

bin/vmlinux.bin:
Expand All @@ -45,7 +53,7 @@ bin/quark-sandboxer:
@mkdir -p bin && cp quark/target/release/quark-sandboxer bin/quark-sandboxer

bin/runc-sandboxer:
@cd runc && cargo build --release
@cd runc && cargo build --release --features=${RUNC_FEATURES}
@mkdir -p bin && cp runc/target/release/runc-sandboxer bin/runc-sandboxer

wasm: bin/wasm-sandboxer
Expand Down
1 change: 0 additions & 1 deletion vmm/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ pub mod storage;
pub mod trace;

pub const KUASAR_STATE_DIR: &str = "/run/kuasar/state";
pub const YOUKI_DIR: &str = "/run/kuasar/youki";

pub const IO_FILE_PREFIX: &str = "io";
pub const STORAGE_FILE_PREFIX: &str = "storage";
Expand Down
Loading

0 comments on commit 59b1f12

Please sign in to comment.