Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,3 @@ LAYERDEPENDS_meta-aws += "meta-python"

LAYERSERIES_COMPAT_meta-aws = "kirkstone"

BBFILES_DYNAMIC += " \
rust-layer:${LAYERDIR}/dynamic-layers/rust-layer/*/*/*.bb \
rust-layer:${LAYERDIR}/dynamic-layers/rust-layer/*/*/*.bbappend \
rust-layer:${LAYERDIR}/dynamic-layers/rust-layer/packagegroups/*.bb \
"

This file was deleted.

7 changes: 7 additions & 0 deletions recipes-containers/firecracker/firecracker-0.24.3.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
DEPENDS += "dtc"

SRC_URI += "\
file://0001-fdt-lib.patch \
file://0002-kvm-bindings-use-local-version.patch \
file://0003-Remove-abort-panic-from-the-workspace.patch \
"
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From b7600c1ab7f3f08339fa69345de6eb248478a78f Mon Sep 17 00:00:00 2001
From: nateglims <glimsdal@amazon.com>
Date: Thu, 19 May 2022 23:38:05 +0000
Subject: [PATCH] kvm-bindings: use local version

Use the local version of kvm-bindings instead of finding it on github.
---
Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f05d00a8..ac01558f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,4 +10,4 @@ panic = "abort"
lto = true

[patch.crates-io]
-kvm-bindings = { git = "https://github.com/firecracker-microvm/kvm-bindings", tag = "v0.3.0-3", features = ["fam-wrappers"] }
+kvm-bindings = { path="../kvm-bindings" , features = ["fam-wrappers"] }
--
2.25.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 96ab5ffcbfab68038aff994eff0a36c4d2a8785a Mon Sep 17 00:00:00 2001
From: nateglims <glimsdal@amazon.com>
Date: Fri, 27 May 2022 17:52:02 +0000
Subject: [PATCH] Remove abort panic from the workspace

---
Cargo.toml | 4 ----
1 file changed, 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ac01558f..2fbed68d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,11 +2,7 @@
members = ["src/firecracker", "src/jailer"]
default-members = ["src/firecracker"]

-[profile.dev]
-panic = "abort"
-
[profile.release]
-panic = "abort"
lto = true

[patch.crates-io]
--
2.25.1

Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ SRC_URI += " \
"

SRCREV_FORMAT .= "_kvm-bindings"
SRCREV_kvm-bindings = "v0.3.0-3"
SRCREV_kvm-bindings = "640ea4fd7c9fa3bb6317ce73a68f5792c9f1feef"
EXTRA_OECARGO_PATHS += "${WORKDIR}/kvm-bindings"

LIC_FILES_CHKSUM = " \
Expand Down
5 changes: 5 additions & 0 deletions recipes-containers/firecracker/jailer-0.24.3.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SRC_URI += "\
file://0002-kvm-bindings-use-local-version.patch \
file://0003-Remove-abort-panic-from-the-workspace.patch \
"

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From b7600c1ab7f3f08339fa69345de6eb248478a78f Mon Sep 17 00:00:00 2001
From: nateglims <glimsdal@amazon.com>
Date: Thu, 19 May 2022 23:38:05 +0000
Subject: [PATCH] kvm-bindings: use local version

Use the local version of kvm-bindings instead of finding it on github.
---
Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index f05d00a8..ac01558f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,4 +10,4 @@ panic = "abort"
lto = true

[patch.crates-io]
-kvm-bindings = { git = "https://github.com/firecracker-microvm/kvm-bindings", tag = "v0.3.0-3", features = ["fam-wrappers"] }
+kvm-bindings = { path="../kvm-bindings" , features = ["fam-wrappers"] }
--
2.25.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 96ab5ffcbfab68038aff994eff0a36c4d2a8785a Mon Sep 17 00:00:00 2001
From: nateglims <glimsdal@amazon.com>
Date: Fri, 27 May 2022 17:52:02 +0000
Subject: [PATCH] Remove abort panic from the workspace

---
Cargo.toml | 4 ----
1 file changed, 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ac01558f..2fbed68d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,11 +2,7 @@
members = ["src/firecracker", "src/jailer"]
default-members = ["src/firecracker"]

-[profile.dev]
-panic = "abort"
-
[profile.release]
-panic = "abort"
lto = true

[patch.crates-io]
--
2.25.1

Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ SRC_URI += " \
"

SRCREV_FORMAT .= "_kvm-bindings"
SRCREV_kvm-bindings = "v0.3.0-3"
SRCREV_kvm-bindings = "640ea4fd7c9fa3bb6317ce73a68f5792c9f1feef"
EXTRA_OECARGO_PATHS += "${WORKDIR}/kvm-bindings"

LIC_FILES_CHKSUM = " \
Expand Down