From c4c8b9314d5292023d5294c749c2b1938a870b47 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 13 Jun 2019 11:07:32 +0100 Subject: [PATCH] build: Switch over to using rust-vmm linux-loader crate With everything now merged upstream we no longer need to rely on Cathy's fork. Signed-off-by: Rob Bradford --- Cargo.lock | 9 ++++++--- arch/Cargo.toml | 2 +- vmm/Cargo.toml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c194a471..17edc59fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "ansi_term" version = "0.9.0" @@ -12,6 +14,7 @@ dependencies = [ "kvm-bindings 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "kvm-ioctls 0.1.0 (git+https://github.com/rust-vmm/kvm-ioctls)", "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", + "linux-loader 0.1.0 (git+https://github.com/rust-vmm/linux-loader)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", ] @@ -269,7 +272,7 @@ dependencies = [ [[package]] name = "linux-loader" version = "0.1.0" -source = "git+https://github.com/bjzhjing/linux-loader#c43b923ef7bea7afbcf7a1f33adf504b90026a17" +source = "git+https://github.com/rust-vmm/linux-loader#891ea4f0af62b2f80f5a3ddbbb6be588b19a78da" dependencies = [ "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", ] @@ -667,7 +670,7 @@ dependencies = [ "kvm-bindings 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "kvm-ioctls 0.1.0 (git+https://github.com/rust-vmm/kvm-ioctls)", "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", - "linux-loader 0.1.0 (git+https://github.com/bjzhjing/linux-loader)", + "linux-loader 0.1.0 (git+https://github.com/rust-vmm/linux-loader)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "net_util 0.1.0", "pci 0.1.0", @@ -735,7 +738,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" "checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d" "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" -"checksum linux-loader 0.1.0 (git+https://github.com/bjzhjing/linux-loader)" = "" +"checksum linux-loader 0.1.0 (git+https://github.com/rust-vmm/linux-loader)" = "" "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" "checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" diff --git a/arch/Cargo.toml b/arch/Cargo.toml index e973cc07b..14ff55095 100644 --- a/arch/Cargo.toml +++ b/arch/Cargo.toml @@ -16,7 +16,7 @@ git = "https://github.com/rust-vmm/vm-memory" features = ["backend-mmap"] [dependencies.linux-loader] -git = "https://github.com/bjzhjing/linux-loader" +git = "https://github.com/rust-vmm/linux-loader" features = ["elf", "bzimage"] [dev-dependencies] diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index 084891d0b..f175f7376 100755 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -20,7 +20,7 @@ vm-allocator = { path = "../vm-allocator" } vmm-sys-util = { git = "https://github.com/rust-vmm/vmm-sys-util" } [dependencies.linux-loader] -git = "https://github.com/bjzhjing/linux-loader" +git = "https://github.com/rust-vmm/linux-loader" features = ["elf", "bzimage"] [dependencies.vm-memory]