Skip to content

Commit 285092a

Browse files
fangn2fangn2
committed
Upgrade firecracker from v1.1.0 to v1.4.1
Update firecracker-go-sdk dependency Remove devtool strip which has been removed in latest firecracker release Signed-off-by: Tony Fang <nhfang@amazon.com>
1 parent 23bad8e commit 285092a

File tree

4 files changed

+53
-35
lines changed

4 files changed

+53
-35
lines changed

‎Makefile‎

Lines changed: 5 additions & 4 deletions
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 $(KERNEL_CONFIG_BASE)
363364

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

‎_submodules/firecracker‎

Submodule firecracker updated 574 files

‎go.mod‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require (
1010
github.com/containerd/go-runc v1.0.0
1111
github.com/containerd/ttrpc v1.1.2
1212
github.com/containerd/typeurl v1.0.2
13-
github.com/containernetworking/cni v1.1.1
13+
github.com/containernetworking/cni v1.1.2
1414
github.com/containernetworking/plugins v1.1.1
15-
github.com/firecracker-microvm/firecracker-go-sdk v0.22.1-0.20220427214706-47505a9cf951
15+
github.com/firecracker-microvm/firecracker-go-sdk v1.0.1-0.20230810002041-4299558794fd
1616
github.com/gofrs/uuid v3.3.0+incompatible
1717
github.com/gogo/protobuf v1.3.2
1818
github.com/hashicorp/go-multierror v1.1.1
@@ -24,12 +24,12 @@ require (
2424
github.com/opencontainers/runtime-spec v1.0.3-0.20210910115017-0d6cc581aeea
2525
github.com/pelletier/go-toml v1.9.5
2626
github.com/shirou/gopsutil v2.18.12+incompatible
27-
github.com/sirupsen/logrus v1.8.1
27+
github.com/sirupsen/logrus v1.9.0
2828
github.com/stretchr/testify v1.8.1
2929
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
3030
go.uber.org/goleak v1.1.12
3131
golang.org/x/sync v0.1.0
32-
golang.org/x/sys v0.6.0
32+
golang.org/x/sys v0.10.0
3333
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect
3434
google.golang.org/grpc v1.47.0
3535
)
@@ -64,16 +64,15 @@ require (
6464
github.com/go-logr/stdr v1.2.2 // indirect
6565
github.com/go-ole/go-ole v1.2.4 // indirect
6666
github.com/go-openapi/analysis v0.21.2 // indirect
67-
github.com/go-openapi/errors v0.20.2 // indirect
67+
github.com/go-openapi/errors v0.20.3 // indirect
6868
github.com/go-openapi/jsonpointer v0.19.5 // indirect
6969
github.com/go-openapi/jsonreference v0.19.6 // indirect
7070
github.com/go-openapi/loads v0.21.1 // indirect
71-
github.com/go-openapi/runtime v0.23.3 // indirect
71+
github.com/go-openapi/runtime v0.24.0 // indirect
7272
github.com/go-openapi/spec v0.20.4 // indirect
73-
github.com/go-openapi/strfmt v0.21.2 // indirect
73+
github.com/go-openapi/strfmt v0.21.3 // indirect
7474
github.com/go-openapi/swag v0.21.1 // indirect
75-
github.com/go-openapi/validate v0.21.0 // indirect
76-
github.com/go-stack/stack v1.8.1 // indirect
75+
github.com/go-openapi/validate v0.22.0 // indirect
7776
github.com/godbus/dbus/v5 v5.0.6 // indirect
7877
github.com/gogo/googleapis v1.4.1 // indirect
7978
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -119,17 +118,17 @@ require (
119118
github.com/urfave/cli v1.22.2 // indirect
120119
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
121120
go.etcd.io/bbolt v1.3.6 // indirect
122-
go.mongodb.org/mongo-driver v1.8.3 // indirect
121+
go.mongodb.org/mongo-driver v1.10.0 // indirect
123122
go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect
124123
go.opencensus.io v0.23.0 // indirect
125124
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
126125
go.opentelemetry.io/otel v1.3.0 // indirect
127126
go.opentelemetry.io/otel/trace v1.3.0 // indirect
128-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
129-
golang.org/x/net v0.8.0 // indirect
127+
golang.org/x/crypto v0.11.0 // indirect
128+
golang.org/x/net v0.12.0 // indirect
130129
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
131-
golang.org/x/term v0.6.0 // indirect
132-
golang.org/x/text v0.8.0 // indirect
130+
golang.org/x/term v0.10.0 // indirect
131+
golang.org/x/text v0.11.0 // indirect
133132
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
134133
google.golang.org/appengine v1.6.7 // indirect
135134
google.golang.org/protobuf v1.28.0 // indirect

0 commit comments

Comments
 (0)