Commit graph

19 commits

Author SHA1 Message Date
Andrew Walbran
ce64fc06d7 Update version of minijail in Cargo.lock.
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>
2020-07-28 17:57:45 +00:00
Alex Lau
4c02765473 docker: update platform2 commit for libvda changes
BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: Ie63d1628e790bb4a8f4314e2882159838b4acf3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2299605
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
2020-07-18 07:52:57 +00:00
Daniel Verkamp
dbf8f9ca0e docker: track minijail in checkout_commits.env
Since the minijail Rust wrapper API can change in incompatible ways
(such as the recent 0.2.0 version bump), track the minijail commit like
other external repositories in checkout_commits.env.

BUG=chromium:1105157
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: I7dd12327e924806374bae951dd31128726d92099
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2295842
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2020-07-14 21:14:35 +00:00
Daniel Verkamp
4462eabaab docker: update platform2 commit for new libvda API
BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: I78ff9e967c9f830f0222503a081266a24336d733
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2285186
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
2020-07-10 01:07:18 +00:00
Daniel Verkamp
5b09409f59 docker: update ADHD checkout for num_channels
Fixes docker/kokoro build failure due to usage of new audio_streams
APIs.

BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: I9549b6301e78169d95498d40bb5383806d4c3b2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2274417
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
2020-06-30 02:44:41 +00:00
Daniel Verkamp
ee215426f4 docker: update ADHD checkout for BoxError
Fixes missing BoxError references and clippy errors.

BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: Icba02a1e1284cce6b40555fad86aecaf7956aa30
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2224775
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2020-06-03 02:27:59 +00:00
Daniel Verkamp
de1f2c59ab docker: update adhd commit for IntoIovec change
BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: Idf81ad58954995bcfb8b222d1613f76f72a2c730
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2220154
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>
2020-05-29 11:31:05 +00:00
Daniel Verkamp
f0fa242b92 docker: update ADHD commit for VolatileSlice changes
Update to include commit 172fe3dee939f4bdc622088699fce8c0653b5389
("libcras: Update VolatileSlice call").

BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: Ib4cf4128204c42abfb8a04c823db2c4faedccbc9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2216398
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Auto-Submit: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2020-05-27 04:46:31 +00:00
Keiichi Watanabe
03a54abf85 docker: update PLATFORM2 commit to fix kokoro build with video
Update to "arc: vm: libvda: Remove redundant single-component import".

BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh
w/ CL:1973973 and CL:1991380.

Change-Id: I696f0bfd8d6d83396e9662ec537147b7d0772f68
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2190102
Tested-by: Keiichi Watanabe <keiichiw@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
2020-05-08 14:48:58 +00:00
Daniel Verkamp
a4dd4af5de docker: update CRAS commit to fix kokoro build
Update to "libcras: Expose try_with_socket_type API".

BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: Id103b44f1c47b39f4701ff2446fd0f31842b2bcc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2172633
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2020-04-30 21:18:22 +00:00
Daniel Verkamp
9f0b9e9785 docker: update CRAS commit to fix clippy error
Update to "libcras: fix warning with Rust 1.43".

BUG=None
TEST=bin/clippy
TEST=docker/wrapped_smoke_test.sh

Change-Id: I1efcc58a5b65483ee3f816df345da9fb62e59e41
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2168154
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2020-04-28 21:00:24 +00:00
Daniel Verkamp
928a8395e0 docker: update ADHD commit to fix kokoro build
Update the audio_streams dependency to fix a build failure introduced in
https://crrev.com/c/2038413.

BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: I99b26c925a8bc5bb6f77575eb64c0972a5a5e0ae
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2116274
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: George Engelbrecht <engeg@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2020-03-24 20:59:23 +00:00
Daniel Verkamp
c7d1d1659a Update audio_streams checkout and dependencies
Uprev the pinned commit and update Cargo.lock to match:
- libcras no longer depends directly on sync
- cras-sys now depends on audio_streams
- audio_streams now depends on sync and sys_util

BUG=None
TEST=`cargo build` and verify Cargo.lock is unchanged
TEST=docker/build_crosm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: Iba1fba57284e1e233725e4086d5d98bb460f118c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2047492
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Dylan Reid <dgreid@chromium.org>
2020-02-11 03:41:10 +00:00
Daniel Verkamp
e7d7728701 Cargo.lock: add sync to libcras dependencies
libcras now depends on crosvm's sync crate; add it to Cargo.lock to
satsify non-portage builds of crosvm with cargo (otherwise cargo updates
Cargo.lock itself).

The dependency was added here:
https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/1871758

The pinned commit for adhd used in the Docker build is also upgraded to
the current master so that it matches.

BUG=None
TEST=`cargo build; git diff` and verify Cargo.lock was not modified

Change-Id: I53526ae2448b95c287528596099a804ec28a16d1
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1924784
2019-11-23 01:04:45 +00:00
Daniel Verkamp
ff783c3b7d docker: update ADHD commit to fix kokoro build
https://crrev.com/c/1856586 uses a new audio_streams interface but did
not update the revision used in kokoro/docker builds to match.  Update
it to fix the crosvm kokoro builder.

BUG=None
TEST=docker/wrapped_smoke_test.sh

Change-Id: I12fda23861aad4b5a12eda79298ac507382188a5
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1876831
Reviewed-by: Fletcher Woodruff <fletcherw@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
2019-10-25 23:54:12 +00:00
Daniel Verkamp
b05e3a5035 docker: add DRM to upgrade_checkout_commits.sh
The DRM repository was added to checkout_commits.env without a
corresponding addition in upgrade_checkout_commits.sh.  Add it and
upgrade all repositories.

BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: Iee7ae7005284cb3b7d0e8e8c983d4ef381781f8e
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1863821
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
2019-10-22 00:09:24 +00:00
Jianxun Zhang
34533fe3ee docker: fix minigbm failure when building base image
Running ./build_crosvm_base.sh failed with the below error:

...
/scratch/minigbm/helpers.c: In function 'layout_from_format':
/scratch/minigbm/helpers.c:156:7: error: \
'DRM_FORMAT_ABGR16161616F' undeclared (first use in this function)
  case DRM_FORMAT_ABGR16161616F:
...

The header file in the libdrm-dev package from debian distro hasn't
included the missed macro. This change builds libdrm from the
upstream source to fix the issue.

BUG=None
TEST=./build_crosvm_base.sh
echo $?

Change-Id: Ifaae4313781ea02ebac9658ab8be9d990a3d5d25
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1841890
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
2019-10-10 18:33:45 +00:00
Zach Reizner
6a0bfb037a docker: add adhd to checkout_commits.env and update all commits
This change also includes some code that was missing from
upgrade_checkout_commits.sh that actually generated the new
checkout_commits.env.

BUG=None
TEST=kokoro/kokoro_simulator.sh
     docker/build_crosvm_base.sh
     docker/build_crosvm.sh

Change-Id: If2505dd9af060d15c36eaf54741d4ae371f6a3c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1641585
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Zach Reizner <zachr@chromium.org>
2019-06-04 00:46:18 +00:00
Zach Reizner
6868c0a72f add docker supported builds and tests
BUG=None
TEST=docker/build_crosvm_base.sh
     docker/build_crosvm.sh
     docker/wrapped_smoke_test.sh
     docker/crosvm_wrapper.sh
     kokoro/kokoro_simulator.sh
     bin/smoke_test

Change-Id: I55a805ba6326c3c58973d1fe21172a5e3551c1e2
Reviewed-on: https://chromium-review.googlesource.com/1593723
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
2019-05-15 13:36:19 -07:00