Skip to content

Commit f35f947

Browse files
committed
Use experimental hermit-entry with image-reader PR applied
1 parent aa616ee commit f35f947

File tree

16 files changed

+38
-779
lines changed

16 files changed

+38
-779
lines changed

Cargo.lock

Lines changed: 8 additions & 99 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = ["hermit-image-reader", "uhyve-interface"]
2+
members = ["uhyve-interface"]
33
exclude = ["tests/test-kernels", "hermit-rs", "hermit-rs/*", "kernel"]
44

55
[package]
@@ -51,8 +51,6 @@ core_affinity = "0.8"
5151
env_logger = "0.11"
5252
gdbstub = "0.7"
5353
gdbstub_arch = "0.3"
54-
hermit-entry = { version = "0.10.5", features = ["loader"] }
55-
hermit-image-reader = { version = "0.1", path = "hermit-image-reader" }
5654
libc = "0.2"
5755
log = "0.4"
5856
mac_address = "1.1"
@@ -76,6 +74,17 @@ merge = { version = "0.2" }
7674
yoke = "0.8"
7775
nohash = "0.2"
7876

77+
[dependencies.hermit-entry]
78+
version = "0.10.5"
79+
git = "https://github.com/fogti/hermit-entry"
80+
branch = "image-reader"
81+
features = [
82+
"config",
83+
"compression",
84+
"loader",
85+
"thin-tree",
86+
]
87+
7988
[target.'cfg(target_os = "linux")'.dependencies]
8089
kvm-bindings = "0.14"
8190
kvm-ioctls = "0.24"

hermit-image-reader/Cargo.toml

Lines changed: 0 additions & 42 deletions
This file was deleted.

hermit-image-reader/LICENSE-APACHE

Lines changed: 0 additions & 1 deletion
This file was deleted.

hermit-image-reader/LICENSE-MIT

Lines changed: 0 additions & 1 deletion
This file was deleted.

hermit-image-reader/README.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

hermit-image-reader/examples/hermit-image-info.rs

Lines changed: 0 additions & 33 deletions
This file was deleted.

hermit-image-reader/src/config.rs

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)