summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-08-09 14:40:39 -0700
committerJoel Galenson <jgalenson@google.com>2021-08-09 14:40:39 -0700
commit570efe19a5181d0a478be828133716861855054c (patch)
tree4d68a4a8055b33213a4a25f24bbd8d684c8975d4
parente7f63d9629cc42e8324c61e781fc58da6ece5b72 (diff)
parentfff997dda0625bd6f7c33bc0d79653c91b41b6c7 (diff)
downloadvmm_vhost-570efe19a5181d0a478be828133716861855054c.tar.gz
Upgrade rust/vmm_vhost to fff997dda0625bd6f7c33bc0d79653c91b41b6c7android-s-beta-5android-s-beta-5
Test: make Change-Id: I1911c42bc5dd48d381ad1978a3d21136233f4712
-rw-r--r--.gitmodules3
-rw-r--r--Cargo.toml9
-rw-r--r--METADATA6
3 files changed, 9 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index bda97eb..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "rust-vmm-ci"]
- path = rust-vmm-ci
- url = https://github.com/rust-vmm/rust-vmm-ci.git
diff --git a/Cargo.toml b/Cargo.toml
index 64bfb5b..94a7f45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,10 +21,13 @@ vhost-user-slave = ["vhost-user"]
[dependencies]
bitflags = ">=1.0.1"
libc = ">=0.2.39"
-
-sys_util = { path = "../../../external/crosvm/sys_util" } # provided by ebuild
-tempfile = { path = "../../../external/crosvm/tempfile" } # provided by ebuild
+sys_util = "*"
+tempfile = "*"
vm-memory = { version = "0.2.0", optional = true }
[dev-dependencies]
vm-memory = { version = "0.2.0", features=["backend-mmap"] }
+
+[patch.crates-io]
+sys_util = { path = "../../../external/crosvm/sys_util" } # ignored by ebuild
+tempfile = { path = "../../../external/crosvm/tempfile" } # ignored by ebuild
diff --git a/METADATA b/METADATA
index 798081c..8d5aa99 100644
--- a/METADATA
+++ b/METADATA
@@ -9,11 +9,11 @@ third_party {
type: GIT
value: "https://chromium.googlesource.com/chromiumos/third_party/rust-vmm/vhost"
}
- version: "eaca5d36a2701c99b354ab5bc0954a78dfc9ff4f"
+ version: "fff997dda0625bd6f7c33bc0d79653c91b41b6c7"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 5
- day: 19
+ month: 8
+ day: 9
}
}