Skip to content

Commit

Permalink
Upgrade firecracker from v1.1.0 to v1.4.0
Browse files Browse the repository at this point in the history
Remove devtool strip which has been removed in latest firecracker release

Signed-off-by: Tony Fang <[email protected]>
  • Loading branch information
fangn2 committed Jul 20, 2023
1 parent 23bad8e commit f926eea
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ ifeq ($(filter $(KERNEL_VERSION),$(KERNEL_VERSIONS)),)
$(error "Kernel version $(KERNEL_VERSION) is not supported. Supported versions are $(KERNEL_VERSIONS)")
endif

KERNEL_CONFIG=tools/kernel-configs/microvm-kernel-$(host_arch)-$(KERNEL_VERSION).config
KERNEL_CONFIG_BASE=microvm-kernel-$(host_arch)-$(KERNEL_VERSION).config
KERNEL_CONFIG=tools/kernel-configs/$(KERNEL_CONFIG_BASE)
# Copied from https://github.com/firecracker-microvm/firecracker/blob/v1.1.0/tools/devtool#L2082
# This allows us to specify a kernel without the patch version, but still get the correct build path to reference the kernel binary
KERNEL_FULL_VERSION=$(shell cat "$(KERNEL_CONFIG)" | grep -Po "^\# Linux\/$(kernel_config_pattern) (([0-9]+.)[0-9]+)" | cut -d ' ' -f 3)
Expand Down Expand Up @@ -345,8 +346,7 @@ $(FIRECRACKER_DIR)/Cargo.toml:
git submodule update --init --recursive $(FIRECRACKER_DIR)

$(FIRECRACKER_BIN): $(FIRECRACKER_DIR)/Cargo.toml
$(FIRECRACKER_DIR)/tools/devtool -y build --release && \
$(FIRECRACKER_DIR)/tools/devtool -y strip
$(FIRECRACKER_DIR)/tools/devtool -y build --release
cp $(FIRECRACKER_DIR)/build/cargo_target/$(FIRECRACKER_TARGET)/release/firecracker $@

.PHONY: firecracker-clean
Expand All @@ -359,7 +359,8 @@ firecracker-clean:
kernel: $(KERNEL_BIN)

$(KERNEL_BIN): $(KERNEL_CONFIG)
$(FIRECRACKER_DIR)/tools/devtool -y build_kernel --config $(KERNEL_CONFIG)
cp $(KERNEL_CONFIG) $(FIRECRACKER_DIR)
$(FIRECRACKER_DIR)/tools/devtool -y build_kernel --config $(FIRECRACKER_DIR)/$(KERNEL_CONFIG_BASE)

.PHONY: install-kernel
install-kernel: $(KERNEL_BIN)
Expand Down
2 changes: 1 addition & 1 deletion _submodules/firecracker
Submodule firecracker updated 568 files

0 comments on commit f926eea

Please sign in to comment.