mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-10 20:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update version of minijail in Cargo.lock.

Browse source 
Also update the version used in Docker/kokoro.

BUG=None
TEST=cargo test

Cq-Depend: chromium:2315829
Change-Id: I659dd48d9f87c610df9fc3cb0cc05594a4ea7138
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2316158
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Allen Webb <allenwebb@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Andrew Walbran 2020-07-23 15:42:46 +01:00 committed by Commit Bot
parent d9b8c77e85
commit ce64fc06d7
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Cargo.lock generated
View file

@ -11,7 +11,7 @@ dependencies = [
"kvm 0.1.0",
"kvm_sys 0.1.0",
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
"minijail 0.2.0",
"minijail 0.2.1",
"remain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"resources 0.1.0",
"sync 0.1.0",
@ -36,7 +36,7 @@ dependencies = [
"kernel_cmdline 0.1.0",
"kvm 0.1.0",
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
"minijail 0.2.0",
"minijail 0.2.1",
"resources 0.1.0",
"sync 0.1.0",
"sys_util 0.1.0",
@ -132,7 +132,7 @@ dependencies = [
"kvm_sys 0.1.0",
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
"libcras 0.1.0",
"minijail 0.2.0",
"minijail 0.2.1",
"msg_socket 0.1.0",
"net_util 0.1.0",
"p9 0.1.0",
@ -191,7 +191,7 @@ dependencies = [
"libcras 0.1.0",
"libvda 0.1.0",
"linux_input_sys 0.1.0",
"minijail 0.2.0",
"minijail 0.2.1",
"msg_on_socket_derive 0.1.0",
"msg_socket 0.1.0",
"net_sys 0.1.0",
@ -465,7 +465,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "minijail"
version = "0.2.0"
version = "0.2.1"
dependencies = [
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
"minijail-sys 0.0.11",
@ -838,7 +838,7 @@ dependencies = [
"kvm 0.1.0",
"kvm_sys 0.1.0",
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
"minijail 0.2.0",
"minijail 0.2.1",
"remain 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"resources 0.1.0",
"sync 0.1.0",

1
docker/Dockerfile
View file

@ -151,6 +151,7 @@ ENV AOSP_EXTERNAL_ROOT=$CROS_ROOT/aosp/external
RUN mkdir -p $AOSP_EXTERNAL_ROOT
# minijail does not exist in upstream linux distros.
ARG MINIJAIL_COMMIT=master
RUN git clone https://android.googlesource.com/platform/external/minijail $AOSP_EXTERNAL_ROOT/minijail \
&& cd $AOSP_EXTERNAL_ROOT/minijail \
&& git checkout $MINIJAIL_COMMIT \

2
docker/checkout_commits.env
View file

@ -4,4 +4,4 @@ TPM2_COMMIT=a9bc45bb7fafc65ea8a787894434d409f533b1f1
PLATFORM2_COMMIT=f34365df7b347901a6433ad83991dfe78b0cb478
ADHD_COMMIT=bb3c49a09be959d8dd60b94d76bf3d46863ff13b
DRM_COMMIT=00320d7d68ddc7d815d073bb7c92d9a1f9bb8c31
MINIJAIL_COMMIT=f95f8cb58674dea82dc74f877689c52bd5c1f90e
MINIJAIL_COMMIT=85d797ecbfd7aefbb9486afeaed3cf5f74858562