Mesa (main): virgl/ci: Prevent static link of virglrenderer inside crosvm

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: efd4bcad20ddf339790f2382f44354c3afb2c0cc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=efd4bcad20ddf339790f2382f44354c3afb2c0cc

Author: Cristian Ciocaltea <cristian.ciocaltea at collabora.com>
Date:   Tue Jan  4 13:20:59 2022 +0200

virgl/ci: Prevent static link of virglrenderer inside crosvm

Ensure virglrenderer library is built before crosvm in order to allow
dynamic linking. This is needed for the scenarios where a different
virglrenderer library must be provided before launching crosvm, e.g.:
the upcoming Virgl CI solution that shares Mesa CI containers.

Additionally, this provides the virgl_test_server binary which is
required by piglit-runner.sh and deqp-runner.sh scripts when using
the virpipe Gallium driver.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea at collabora.com>
Reviewed-by: Rohan Garg <rohan.garg at intel.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14413>

---

 .gitlab-ci/container/build-crosvm.sh | 2 ++
 .gitlab-ci/image-tags.yml            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh
index 41f0140fe75..bd5fbfbb52d 100644
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -11,6 +11,8 @@ git submodule update --init
 VIRGLRENDERER_VERSION=2a5fb800c6b0ce15ad37c2c698635e3e2d27b37c
 pushd third_party/virglrenderer
 git checkout "$VIRGLRENDERER_VERSION"
+meson build/ $EXTRA_MESON_ARGS
+ninja -C build install
 popd
 
 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 36185a77d00..475729c16c5 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -8,7 +8,7 @@ variables:
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_GL_TAG: "2021-12-31-refactor"
+   DEBIAN_X86_TEST_GL_TAG: "2022-01-03-crosvm"
    DEBIAN_X86_TEST_VK_TAG: "2022-01-02-deqp-runner"
 
    FEDORA_X86_BUILD_TAG: "2021-12-31-refactor"