diff options
| author | Daniel Verkamp <dverkamp@chromium.org> | 2020-02-18 10:31:20 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-19 01:05:34 +0000 |
| commit | 2dae56768c0dcfb57ff07c051f5785162632073e (patch) | |
| tree | 06f8a2f76a8a3f83aa9e78ca9062e08d4cae1424 /Cargo.lock | |
| parent | 1ba620d8219cbda05ca170ad8ffefa76d6bb72d4 (diff) | |
| download | crosvm-2dae56768c0dcfb57ff07c051f5785162632073e.tar crosvm-2dae56768c0dcfb57ff07c051f5785162632073e.tar.gz crosvm-2dae56768c0dcfb57ff07c051f5785162632073e.tar.bz2 crosvm-2dae56768c0dcfb57ff07c051f5785162632073e.tar.lz crosvm-2dae56768c0dcfb57ff07c051f5785162632073e.tar.xz crosvm-2dae56768c0dcfb57ff07c051f5785162632073e.tar.zst crosvm-2dae56768c0dcfb57ff07c051f5785162632073e.zip | |
docker: check out minijail in expected location
Move the minijail source checkout location in the Dockerfile so that it is in the expected place relative to the crosvm checkout so that Docker (and kokoro) can successfully find it. Also update Cargo.lock for the new minijail-sys dependency; this fixes "read-only filesystem" errors from cargo running inside Docker when it tries to write the updated Cargo.lock. BUG=None TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh Change-Id: Ic399030004c2c4891a03a60474348b0bed9f01d7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2062675 Reviewed-by: Dylan Reid <dgreid@chromium.org> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'Cargo.lock')
| -rw-r--r-- | Cargo.lock | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1aea075..0ec0a39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,6 +106,7 @@ dependencies = [ "kvm_sys 0.1.0", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "libcras 0.1.0", + "minijail-sys 0.0.11", "msg_socket 0.1.0", "net_util 0.1.0", "p9 0.1.0", @@ -240,7 +241,7 @@ name = "io_jail" version = "0.1.0" dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "net_sys 0.1.0", + "minijail-sys 0.0.11", ] [[package]] @@ -311,6 +312,14 @@ dependencies = [ ] [[package]] +name = "minijail-sys" +version = "0.0.11" +dependencies = [ + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "msg_on_socket_derive" version = "0.1.0" dependencies = [ |