Skip to content

Commit cc86796

Browse files
authored
Merge pull request #470 from kzys/fc-upgrade
Update Firecracker from v0.23.0 to v0.24.1
2 parents afa3df0 + e006e90 commit cc86796

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export GO_CACHE_VOLUME_NAME?=gocache
3535
FIRECRACKER_DIR=$(SUBMODULES)/firecracker
3636
FIRECRACKER_TARGET?=x86_64-unknown-linux-musl
3737
FIRECRACKER_BIN=$(FIRECRACKER_DIR)/build/cargo_target/$(FIRECRACKER_TARGET)/release/firecracker
38-
JAILER_BIN=$(FIRECRACKER_DIR)/build/cargo_target/$(FIRECRACKER_TARGET)/release/jailer
3938
FIRECRACKER_BUILDER_NAME?=firecracker-builder
4039
CARGO_CACHE_VOLUME_NAME?=cargocache
4140

@@ -282,12 +281,11 @@ demo-network: install-cni-bins $(FCNET_CONFIG)
282281
# Firecracker submodule
283282
##########################
284283
.PHONY: firecracker
285-
firecracker: $(FIRECRACKER_BIN) $(JAILER_BIN)
284+
firecracker: $(FIRECRACKER_BIN)
286285

287286
.PHONY: install-firecracker
288287
install-firecracker: firecracker
289288
install -D -o root -g root -m755 -t $(INSTALLROOT)/bin $(FIRECRACKER_BIN)
290-
install -D -o root -g root -m755 -t $(INSTALLROOT)/bin $(JAILER_BIN)
291289

292290
$(FIRECRACKER_DIR)/Cargo.toml:
293291
git submodule update --init --recursive $(FIRECRACKER_DIR)
@@ -299,7 +297,7 @@ tools/firecracker-builder-stamp: tools/docker/Dockerfile.firecracker-builder
299297
tools/docker
300298
touch $@
301299

302-
$(FIRECRACKER_BIN) $(JAILER_BIN): $(FIRECRACKER_DIR)/Cargo.toml tools/firecracker-builder-stamp
300+
$(FIRECRACKER_BIN): $(FIRECRACKER_DIR)/Cargo.toml tools/firecracker-builder-stamp
303301
docker run --rm -it --user $(UID) \
304302
--volume $(CURDIR)/$(FIRECRACKER_DIR):/src \
305303
--volume $(CARGO_CACHE_VOLUME_NAME):/usr/local/cargo/registry \
@@ -310,7 +308,7 @@ $(FIRECRACKER_BIN) $(JAILER_BIN): $(FIRECRACKER_DIR)/Cargo.toml tools/firecracke
310308

311309
.PHONY: firecracker-clean
312310
firecracker-clean:
313-
rm -f $(FIRECRACKER_BIN) $(JAILER_BIN)
311+
rm -f $(FIRECRACKER_BIN)
314312
- docker run --rm -it --user $(UID) \
315313
--volume $(CURDIR)/$(FIRECRACKER_DIR):/src \
316314
-e HOME=/tmp \

_submodules/firecracker

Submodule firecracker updated 244 files

0 commit comments

Comments
 (0)