diff options
| author | Gurchetan Singh <gurchetansingh@chromium.org> | 2019-08-16 09:28:28 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-20 17:46:23 +0000 |
| commit | 84d59e76b37095faf11195e2940978bd2af9e949 (patch) | |
| tree | 3a343abc9e47a116c2ac8aac37963e7ced3fbee0 | |
| parent | 99c9c685b5805bd8522a4f3b4d904a39c71ecf6a (diff) | |
| download | crosvm-84d59e76b37095faf11195e2940978bd2af9e949.tar crosvm-84d59e76b37095faf11195e2940978bd2af9e949.tar.gz crosvm-84d59e76b37095faf11195e2940978bd2af9e949.tar.bz2 crosvm-84d59e76b37095faf11195e2940978bd2af9e949.tar.lz crosvm-84d59e76b37095faf11195e2940978bd2af9e949.tar.xz crosvm-84d59e76b37095faf11195e2940978bd2af9e949.tar.zst crosvm-84d59e76b37095faf11195e2940978bd2af9e949.zip | |
Dockerfile: stop tracking virglrenderer master
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>
| -rw-r--r-- | docker/Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 7d4d915..b48506f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -89,9 +89,11 @@ RUN git clone https://github.com/anholt/libepoxy.git \ && meson \ && ninja install -# virglrenderer is under heavy development on master and we want the very latest. -RUN git clone https://gitlab.freedesktop.org/virgl/virglrenderer.git \ +# We've forked virglrenderer to accomodate differences in the GBM header. +# Until we can upstream our changes, build based on this downstream tree. +RUN git clone https://gitlab.freedesktop.org/gurchetansingh/virglrenderer.git \ && cd virglrenderer \ + && git checkout keep-kokoro-happy \ && ./autogen.sh \ && make install -j$(nproc) |