Skip to content

[RFC] enable alternative installation and log path #1288

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

Open
shrik3 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[RFC] enable alternative installation and log path #1288

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
457f015
makefile: export common env for child process
shrik3 May 24, 2024
91c4a64
makefile: do not explicitly require sudo for install
shrik3 May 24, 2024
d499f85
enable alternative log, config and bin path
shrik3 May 24, 2024
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
18 changes: 9 additions & 9 deletions makefile
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@chl337 chl337 Jun 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add a condition to check which files to copy over? It is annoying to get false negatives. I have a (semi) fix for that in the previous version, maybe do something similar.

Cheers

Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ qvisor_cuda_debug:
make -C ./qvisor cuda_debug

install:
-sudo cp -f $(QKERNEL_RELEASE) $(QBIN_DIR)/
-sudo cp -f $(QUARK_RELEASE) $(QBIN_DIR)/quark
-sudo cp -f $(QUARK_RELEASE) $(QBIN_DIR)/containerd-shim-quark-v1
-sudo cp -f $(QKERNEL_DEBUG) $(QBIN_DIR)/
-sudo cp -f $(QUARK_DEBUG) $(QBIN_DIR)/quark_d
-sudo cp -f $(QUARK_DEBUG) $(QBIN_DIR)/containerd-shim-quarkd-v1
sudo cp -f $(VDSO) $(QBIN_DIR)/vdso.so
sudo mkdir -p $(QCONFIG_DIR)
sudo cp -f config.json $(QCONFIG_DIR)
-cp -f $(QKERNEL_RELEASE) $(QBIN_DIR)/
-cp -f $(QUARK_RELEASE) $(QBIN_DIR)/quark
-cp -f $(QUARK_RELEASE) $(QBIN_DIR)/containerd-shim-quark-v1
-cp -f $(QKERNEL_DEBUG) $(QBIN_DIR)/
-cp -f $(QUARK_DEBUG) $(QBIN_DIR)/quark_d
-cp -f $(QUARK_DEBUG) $(QBIN_DIR)/containerd-shim-quarkd-v1
cp -f $(VDSO) $(QBIN_DIR)/vdso.so
mkdir -p $(QCONFIG_DIR)
cp -f config.json $(QCONFIG_DIR)

cuda_make:
make -C cudaproxy release
Expand Down