From 2ab3d2559de51fed2674ae6bfefa797edd278800 Mon Sep 17 00:00:00 2001 From: Hugo Herter Date: Thu, 13 Jun 2024 19:52:07 +0200 Subject: [PATCH] fixup! wrong Makefile dependency --- .gitmodules | 3 +++ packaging/Makefile | 7 ++++--- packaging/sevctl | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 packaging/sevctl diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..2ff335f49 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "packaging/sevctl"] + path = packaging/sevctl + url = https://github.com/virtee/sevctl diff --git a/packaging/Makefile b/packaging/Makefile index 594b19ea3..f0c7f5c1a 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -18,7 +18,7 @@ debian-package-code: pip3 install --target ./aleph-vm/opt/aleph-vm/ 'aleph-message==0.4.4' 'eth-account==0.10' 'sentry-sdk==1.31.0' 'qmp==1.1.0' 'superfluid==0.2.1' 'sqlalchemy[asyncio]>=2.0' 'aiosqlite==0.19.0' 'alembic==1.13.1' 'aiohttp_cors==0.7.0' 'pyroute2==0.7.12' python3 -m compileall ./aleph-vm/opt/aleph-vm/ -debian-package-resources: firecracker-bins vmlinux download-ipfs-kubo sevctl +debian-package-resources: firecracker-bins vmlinux download-ipfs-kubo target/sevctl rm -fr ./aleph-vm/opt/firecracker mkdir -p ./aleph-vm/opt/firecracker cp -pr ./target/vmlinux.bin ./aleph-vm/opt/firecracker/ @@ -46,9 +46,9 @@ download-ipfs-kubo: target-dir build-dir mkdir -p ./target/kubo curl -fsSL https://github.com/ipfs/kubo/releases/download/v0.23.0/kubo_v0.23.0_linux-amd64.tar.gz | tar -xz --directory ./target/kubo -sevctl: +target/sevctl: cd ./sevctl && cargo build --release --target x86_64-unknown-linux-gnu - ./sevctl/target/x86_64-unknown-linux-gnu/release/sevctl ok + ./sevctl/target/x86_64-unknown-linux-gnu/release/sevctl -V cp ./sevctl/target/x86_64-unknown-linux-gnu/release/sevctl ./target/sevctl sevctl-podman: @@ -73,6 +73,7 @@ clean: rm -fr ./target/* rm -fr ./build/* rm -fr ./aleph-vm/opt/aleph-vm/ + rm -fr ./sevctl/target/ all-podman-debian-11: version cd .. && podman build -t localhost/aleph-vm-packaging-debian-11:latest -f ./packaging/debian-11.dockerfile . diff --git a/packaging/sevctl b/packaging/sevctl new file mode 160000 index 000000000..1e53a5afa --- /dev/null +++ b/packaging/sevctl @@ -0,0 +1 @@ +Subproject commit 1e53a5afafa2c95a79fbc42a25823dbf6dce0717