summary refs log tree commit diff
path: root/docker
Commit message (Collapse)AuthorAge
* docker: update ADHD checkout for BoxErrorDaniel Verkamp2020-06-03
| | | | | | | | | | | | | 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>
* docker: update adhd commit for IntoIovec changeDaniel Verkamp2020-05-29
| | | | | | | | | | | 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>
* docker: update ADHD commit for VolatileSlice changesDaniel Verkamp2020-05-27
| | | | | | | | | | | | | | | | 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>
* docker: update PLATFORM2 commit to fix kokoro build with videoKeiichi Watanabe2020-05-08
| | | | | | | | | | | | | | | 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>
* docker: update CRAS commit to fix kokoro buildDaniel Verkamp2020-04-30
| | | | | | | | | | | | | | 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>
* docker: update CRAS commit to fix clippy errorDaniel Verkamp2020-04-28
| | | | | | | | | | | | | | 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>
* docker: update to rust 1.42 and rustup 1.21.1Daniel Verkamp2020-04-18
| | | | | | | | | | | | | | | | | | | | | | Update to the latest rustup release, which (since 1.20.0) installs rustfmt and clippy by default: https://blog.rust-lang.org/2019/10/15/Rustup-1.20.0.html Also update the Rust toolchain version to 1.42.0 to match the version in the CrOS build environment. Additionally, add workarounds for sysroot of cargo clippy. BUG=None TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh TEST=bin/clippy on workstation Change-Id: I7ac4db92f4e5f277d77a77fa3c4ffa880f2ae116 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2150988 Tested-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
* docker: Put libvda.pc under /pkgconfig/Keiichi Watanabe2020-04-17
| | | | | | | | | | | | | | | | | Put a dummy pc file for libvda under /docker/pkgconfig/ instead of generating at the runtime. This is a fix for CL:2133987, but shouldn't change any behavior. BUG=none TEST=build_crosvm_base.sh && build_crosvm.sh with CL:1973973 Change-Id: Ifd7677abf14346ca2e7a9bc48b5ebb6c519b78aa Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2145533 Tested-by: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
* crosvm: Enable cargo clippy in smoke_testKeiichi Watanabe2020-04-15
| | | | | | | | | | | | | | | | | | Enable cargo clippy in the smoke test script for kokoro with many whitelisted rules to be resolved. This check will reject compile warnings as well. Also, this CL removes cargo check in Docker.crosvm as cargo clippy is a superset of cargo check. BUG=chromium:908640 TEST=./wrapped_smoke_test.sh Change-Id: Iaa546fc0166e3d9762c5e91144d036725d38b0f9 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2145538 Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org> Tested-by: Keiichi Watanabe <keiichiw@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
* docker: Add setup for libvdaKeiichi Watanabe2020-04-04
| | | | | | | | | | | | | | | | | | | Add the following setup for libvda, which will be used by video features introduced by CL:1973973: * Pull down platform2 as /platform2 * Create a dummpy libvda.pc file Note that we don't build libvda.so. BUG=b:147465619 TEST=build_crosvm.sh Change-Id: I1f61df57244a13b7df1b7a373d955b6cfe91e188 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2133987 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
* docker: Run cargo check with all features enabledKeiichi Watanabe2020-04-04
| | | | | | | | | | | | | | | The current Dockerfile builds crosvm only with some selected features. To cover all of crosvm code, this CL adds 'cargo check' command. BUG=none TEST=./build_crosvm_base.sh && ./build_crosvm.sh Change-Id: I6e1efa8f68476912c9cec46188f096d430df663c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2134003 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
* docker: update ADHD commit to fix kokoro buildDaniel Verkamp2020-03-24
| | | | | | | | | | | | | | | | | 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>
* docker: check out minijail in expected locationDaniel Verkamp2020-02-19
| | | | | | | | | | | | | | | | | | | 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>
* docker: upgrade rustc to 1.41.0Daniel Verkamp2020-02-13
| | | | | | | | | | | BUG=chromium:1050853 TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh Change-Id: Id98a05c6ca01c9220e692cefc1a2c1d9eca50834 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2049243 Reviewed-by: Stephen Barber <smbarber@chromium.org> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org> Tested-by: Daniel Verkamp <dverkamp@chromium.org>
* Update audio_streams checkout and dependenciesDaniel Verkamp2020-02-11
| | | | | | | | | | | | | | | | | 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>
* Cargo.lock: add sync to libcras dependenciesDaniel Verkamp2019-11-23
| | | | | | | | | | | | | | | | | | | 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
* docker: upgrade to Rust 1.38.0Daniel Verkamp2019-10-30
| | | | | | | | | | | BUG=None TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh Change-Id: I3987db0b989105b5ecca41ac2973324374fa5db0 Signed-off-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1863001 Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
* docker: update ADHD commit to fix kokoro buildDaniel Verkamp2019-10-25
| | | | | | | | | | | | | | | 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>
* docker: add DRM to upgrade_checkout_commits.shDaniel Verkamp2019-10-22
| | | | | | | | | | | | | | | 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>
* docker: fix a failure when building crosvmJianxun Zhang2019-10-10
| | | | | | | | | | | | | | | | | | What fixed by this change failed crosvm build with docker on non-Nvidia platforms. BUG=None TEST=./build_crosvm_base.sh ./build_crosvm.sh ./wrapped_smoke_test.sh Change-Id: Ib2cc70d5bd98bcad25410ba54c0492491a3ea799 Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1842519 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Zach Reizner <zachr@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
* docker: fix minigbm failure when building base imageJianxun Zhang2019-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* docker: make using X11 gpu display easier with dockerZach Reizner2019-08-28
| | | | | | | | | | | | | | | | | This change makes using docker a bit easier when displaying on the hosts X11 server. The biggest change was that build_crosvm.sh will install the hosts NVIDIA proprietary driver if needed. TEST=docker/build_crosvm.sh docker/crosvm_wrapper.sh BUG=None Change-Id: If64074715b0ad3a06727a4cc764d3ac06c4dfece Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1759139 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>
* Dockerfile: stop tracking virglrenderer masterGurchetan Singh2019-08-20
| | | | | | | | | | | | | | | | | | With crrev.com/c/1745316, the regular ChromeOS build started adding epatches to virglrenderer. Therefore, don't track virglrenderer master for the time being, until we can upstream and/or remove our downstream APIs. BUG=chromium:906811 TEST=docker/wrapped_smoke_test.sh Change-Id: I9567e9286130048fb793fecb4ff3801b7d64ddba Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1758371 Tested-by: Gurchetan Singh <gurchetansingh@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org> Reviewed-by: David Riley <davidriley@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
* docker: support passing extra arguments to scriptsJianxun Zhang2019-08-07
| | | | | | | | | | | | | | | | | | | One of the usages is to specify proxy setting so that these scripts can download packages behind proxies. It looks cleaner and more flexible than tweaking the docker file that's checked in the repo. BUG=None TEST=run commands behind a network proxy ./build_crosvm_base.sh --build-arg http_proxy --build-arg https_proxy ./build_crosvm.sh --build-arg http_proxy --build-arg https_proxy ./wrapped_smoke_test.sh -e http_proxy -e https_proxy Change-Id: Id3729a1343b12c1c7553e047701f770620e3c975 Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1737540 Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
* rust-toolchain: upgrade to Rust 1.36.0Daniel Verkamp2019-07-30
| | | | | | | | | | | | | | Update the rust-toolchain file and Docker image used in kokoro to match the Chrome OS toolchain. BUG=None TEST=docker/wrapped_smoke_test.sh Change-Id: I95cbf9bcaadd49b8476f2829bc75958dbea304e3 Signed-off-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1724850 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Zach Reizner <zachr@chromium.org>
* docker: add adhd to checkout_commits.env and update all commitsZach Reizner2019-06-04
| | | | | | | | | | | | | | | | | | 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>
* rust-toolchain: upgrade to Rust 1.35.0Daniel Verkamp2019-05-30
| | | | | | | | | | | BUG=None TEST=docker/wrapped_smoke_test.sh Change-Id: I0a159d9b54d97098d633ce80b92eeb48eb5c4b55 Signed-off-by: Daniel Verkamp <dverkamp@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1632036 Reviewed-by: Zach Reizner <zachr@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
* add docker supported builds and testsZach Reizner2019-05-15
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>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-04 05:41:16 +0000