Skip to content

Commit f926eea

Browse files
committed
Upgrade firecracker from v1.1.0 to v1.4.0
Remove devtool strip which has been removed in latest firecracker release Signed-off-by: Tony Fang <[email protected]>
1 parent 23bad8e commit f926eea

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ ifeq ($(filter $(KERNEL_VERSION),$(KERNEL_VERSIONS)),)
5656
$(error "Kernel version $(KERNEL_VERSION) is not supported. Supported versions are $(KERNEL_VERSIONS)")
5757
endif
5858

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

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

352352
.PHONY: firecracker-clean
@@ -359,7 +359,8 @@ firecracker-clean:
359359
kernel: $(KERNEL_BIN)
360360

361361
$(KERNEL_BIN): $(KERNEL_CONFIG)
362-
$(FIRECRACKER_DIR)/tools/devtool -y build_kernel --config $(KERNEL_CONFIG)
362+
cp $(KERNEL_CONFIG) $(FIRECRACKER_DIR)
363+
$(FIRECRACKER_DIR)/tools/devtool -y build_kernel --config $(FIRECRACKER_DIR)/$(KERNEL_CONFIG_BASE)
363364

364365
.PHONY: install-kernel
365366
install-kernel: $(KERNEL_BIN)

_submodules/firecracker

Submodule firecracker updated 568 files

0 commit comments

Comments
 (0)