From 84d59e76b37095faf11195e2940978bd2af9e949 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Fri, 16 Aug 2019 09:28:28 -0700 Subject: [PATCH] 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 Tested-by: kokoro Commit-Queue: Gurchetan Singh Reviewed-by: David Riley Reviewed-by: Zach Reizner --- docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7d4d915ff4..b48506f8a1 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)