diff --git a/Makefile b/Makefile index 23abc2a30..1586ce8d5 100644 --- a/Makefile +++ b/Makefile @@ -123,13 +123,13 @@ emulate-reflash: $(MAKE) install REMOTE=$(REMOTE) DESTDIR=/media/embassy/next OS_ARCH=$(OS_ARCH) ssh $(REMOTE) "sudo touch /media/embassy/config/upgrade && sudo rm -f /media/embassy/config/disk.guid && sudo sync && sudo reboot" -system-images/compat/docker-images/aarch64.tar system-images/compat/docker-images/x86_64.tar: $(COMPAT_SRC) +system-images/compat/docker-images/aarch64.tar system-images/compat/docker-images/x86_64.tar: $(COMPAT_SRC) | sudo cd system-images/compat && make -system-images/utils/docker-images/aarch64.tar system-images/utils/docker-images/x86_64.tar: $(UTILS_SRC) +system-images/utils/docker-images/aarch64.tar system-images/utils/docker-images/x86_64.tar: $(UTILS_SRC) | sudo cd system-images/utils && make -system-images/binfmt/docker-images/aarch64.tar system-images/binfmt/docker-images/x86_64.tar: $(BINFMT_SRC) +system-images/binfmt/docker-images/aarch64.tar system-images/binfmt/docker-images/x86_64.tar: $(BINFMT_SRC) | sudo cd system-images/binfmt && make raspios.img: @@ -141,7 +141,7 @@ snapshots: libs/snapshot_creator/Cargo.toml cd libs/ && ./build-v8-snapshot.sh cd libs/ && ./build-arm-v8-snapshot.sh -$(EMBASSY_BINS): $(BACKEND_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) frontend/patchdb-ui-seed.json +$(EMBASSY_BINS): $(BACKEND_SRC) $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) frontend/patchdb-ui-seed.json | sudo cd backend && ARCH=$(ARCH) ./build-prod.sh touch $(EMBASSY_BINS) @@ -191,8 +191,8 @@ ui: frontend/dist/ui # used by github actions backend: $(EMBASSY_BINS) -cargo-deps/aarch64-unknown-linux-gnu/release/nc-broadcast: +cargo-deps/aarch64-unknown-linux-gnu/release/nc-broadcast: | sudo ARCH=$(ARCH) ./build-cargo-dep.sh nc-broadcast -cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep: - ARCH=$(ARCH) ./build-cargo-dep.sh pi-beep \ No newline at end of file +cargo-deps/aarch64-unknown-linux-gnu/release/pi-beep: | sudo + ARCH=$(ARCH) ./build-cargo-dep.sh pi-beep diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock index 6f3e60289..594d00321 100644 --- a/system-images/compat/Cargo.lock +++ b/system-images/compat/Cargo.lock @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" dependencies = [ "proc-macro2 1.0.50", "quote 1.0.23", @@ -1771,6 +1771,7 @@ dependencies = [ name = "helpers" version = "0.1.0" dependencies = [ + "async-trait", "color-eyre", "futures", "lazy_async_pool",