Skip to content

Commit 3c66c1e

Browse files
authored
Merge pull request firecracker-microvm#517 from gc-plp/makefile_devtool
makefile: use firecracker devtool for building
2 parents 464d3a4 + b87f9d0 commit 3c66c1e

File tree

2 files changed

+5
-50
lines changed

2 files changed

+5
-50
lines changed

Makefile

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -290,31 +290,14 @@ install-firecracker: firecracker
290290
$(FIRECRACKER_DIR)/Cargo.toml:
291291
git submodule update --init --recursive $(FIRECRACKER_DIR)
292292

293-
tools/firecracker-builder-stamp: tools/docker/Dockerfile.firecracker-builder
294-
docker build \
295-
-t localhost/$(FIRECRACKER_BUILDER_NAME):$(DOCKER_IMAGE_TAG) \
296-
-f tools/docker/Dockerfile.firecracker-builder \
297-
tools/docker
298-
touch $@
299-
300-
$(FIRECRACKER_BIN): $(FIRECRACKER_DIR)/Cargo.toml tools/firecracker-builder-stamp
301-
docker run --rm -it --user $(UID) \
302-
--volume $(CURDIR)/$(FIRECRACKER_DIR):/src \
303-
--volume $(CARGO_CACHE_VOLUME_NAME):/usr/local/cargo/registry \
304-
-e HOME=/tmp \
305-
--workdir /src \
306-
localhost/$(FIRECRACKER_BUILDER_NAME):$(DOCKER_IMAGE_TAG) \
307-
cargo build --release --target $(FIRECRACKER_TARGET)
293+
$(FIRECRACKER_BIN): $(FIRECRACKER_DIR)/Cargo.toml
294+
$(FIRECRACKER_DIR)/tools/devtool -y build --release && \
295+
$(FIRECRACKER_DIR)/tools/devtool strip
308296

309297
.PHONY: firecracker-clean
310298
firecracker-clean:
311-
rm -f $(FIRECRACKER_BIN)
312-
- docker run --rm -it --user $(UID) \
313-
--volume $(CURDIR)/$(FIRECRACKER_DIR):/src \
314-
-e HOME=/tmp \
315-
--workdir /src \
316-
localhost/$(FIRECRACKER_BUILDER_NAME):$(DOCKER_IMAGE_TAG) \
317-
cargo clean
299+
- $(FIRECRACKER_DIR)/tools/devtool distclean
300+
- rm $(FIRECRACKER_BIN)
318301

319302
##########################
320303
# RunC submodule

tools/docker/Dockerfile.firecracker-builder

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)