Skip to content

Commit 2179fbf

Browse files
committed
Add tiny Makefile for building virtme-ng-init
This is primarily just a small convenience for building an updated virtme-ng-init when running vng from the source directory. In order to keep the definition of "how to build init" in one place, also update setup.py to run 'make' instead of directly invoking 'cargo'. Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
1 parent 4c65839 commit 2179fbf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.PHONY: init
2+
init:
3+
cd virtme_ng_init && cargo install --path . --root ../virtme/guest

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ def run(self):
5959
print(f"BUILD_VIRTME_NG_INIT: {build_virtme_ng_init}")
6060
# Build virtme-ng-init
6161
if build_virtme_ng_init:
62-
check_call(
63-
["cargo", "install", "--path", ".", "--root", "../virtme/guest"],
64-
cwd="virtme_ng_init",
65-
)
62+
check_call(["make", "init"])
6663
check_call(
6764
["strip", "-s", "../virtme/guest/bin/virtme-ng-init"],
6865
cwd="virtme_ng_init",

0 commit comments

Comments
 (0)