summary refs log tree commit diff
diff options
context:
space:
mode:
authorZach Reizner <zachr@google.com>2017-09-19 17:48:41 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-09-20 03:39:24 -0700
commitab839e293da62aaff07d04503538808719ce83d9 (patch)
tree4d482e510515c5decd5ee02cddd1ef359cf3c5e6
parent42b3e8da55a5bcb6038728a2843a673aa5826c04 (diff)
downloadcrosvm-ab839e293da62aaff07d04503538808719ce83d9.tar
crosvm-ab839e293da62aaff07d04503538808719ce83d9.tar.gz
crosvm-ab839e293da62aaff07d04503538808719ce83d9.tar.bz2
crosvm-ab839e293da62aaff07d04503538808719ce83d9.tar.lz
crosvm-ab839e293da62aaff07d04503538808719ce83d9.tar.xz
crosvm-ab839e293da62aaff07d04503538808719ce83d9.tar.zst
crosvm-ab839e293da62aaff07d04503538808719ce83d9.zip
fix dependency versions and add Cargo.lock
To ensure dependencies don't accidentally get updated, their versions are
fixed using the equals constraint. The Cargo.lock file is also checked in
so that the registry won't need to be downloaded by cargo.

These changes are needed so that the crosvm ebuild will not need to
download anything outside of its list of source packages.

TEST=./build_test
BUG=None

Change-Id: Iae8472de77e3589a453685717b26fb1ceb44e257
Reviewed-on: https://chromium-review.googlesource.com/674092
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
-rw-r--r--Cargo.lock133
-rw-r--r--Cargo.toml4
-rw-r--r--sys_util/Cargo.toml2
3 files changed, 136 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..bdffbfd
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,133 @@
+[root]
+name = "crosvm"
+version = "0.1.0"
+dependencies = [
+ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "data_model 0.1.0",
+ "io_jail 0.1.0",
+ "kernel_loader 0.1.0",
+ "kvm 0.1.0",
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net_sys 0.1.0",
+ "net_util 0.1.0",
+ "sys_util 0.1.0",
+ "syscall_defines 0.1.0",
+ "vhost 0.1.0",
+ "virtio_sys 0.1.0",
+ "x86_64 0.1.0",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "data_model"
+version = "0.1.0"
+
+[[package]]
+name = "gcc"
+version = "0.3.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "io_jail"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "kernel_loader"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sys_util 0.1.0",
+]
+
+[[package]]
+name = "kvm"
+version = "0.1.0"
+dependencies = [
+ "kvm_sys 0.1.0",
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sys_util 0.1.0",
+]
+
+[[package]]
+name = "kvm_sys"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sys_util 0.1.0",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "net_sys"
+version = "0.1.0"
+dependencies = [
+ "sys_util 0.1.0",
+]
+
+[[package]]
+name = "net_util"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net_sys 0.1.0",
+ "sys_util 0.1.0",
+]
+
+[[package]]
+name = "sys_util"
+version = "0.1.0"
+dependencies = [
+ "data_model 0.1.0",
+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syscall_defines 0.1.0",
+]
+
+[[package]]
+name = "syscall_defines"
+version = "0.1.0"
+
+[[package]]
+name = "vhost"
+version = "0.1.0"
+dependencies = [
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net_util 0.1.0",
+ "sys_util 0.1.0",
+ "virtio_sys 0.1.0",
+]
+
+[[package]]
+name = "virtio_sys"
+version = "0.1.0"
+dependencies = [
+ "sys_util 0.1.0",
+]
+
+[[package]]
+name = "x86_64"
+version = "0.1.0"
+dependencies = [
+ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "data_model 0.1.0",
+ "kvm 0.1.0",
+ "kvm_sys 0.1.0",
+ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sys_util 0.1.0",
+]
+
+[metadata]
+"checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d"
+"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
+"checksum libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264"
diff --git a/Cargo.toml b/Cargo.toml
index fe51f13..64cb4e2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,8 +12,8 @@ io_jail = { path = "io_jail" }
 kvm = { path = "kvm" }
 sys_util = { path = "sys_util" }
 kernel_loader = { path = "kernel_loader" }
-libc = "0.2.29"
-byteorder = "1"
+libc = "=0.2.29"
+byteorder = "=1.1.0"
 syscall_defines = { path = "syscall_defines" }
 net_sys = { path = "net_sys" }
 net_util = { path = "net_util" }
diff --git a/sys_util/Cargo.toml b/sys_util/Cargo.toml
index bc9e1f9..8a7b50a 100644
--- a/sys_util/Cargo.toml
+++ b/sys_util/Cargo.toml
@@ -10,4 +10,4 @@ libc = "*"
 syscall_defines = { path = "../syscall_defines" }
 
 [build-dependencies]
-gcc = "0.3"
+gcc = "=0.3.54"