Module: Mesa Branch: main Commit: c30c7ba83452a072aee3fdc393bd72ac80d87639 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c30c7ba83452a072aee3fdc393bd72ac80d87639
Author: Cristian Ciocaltea <[email protected]> Date: Fri Feb 18 13:35:51 2022 +0200 ci: Build crosvm for LAVA runners This is the first step to add support for running crosvm inside LAVA. Signed-off-by: Cristian Ciocaltea <[email protected]> Reviewed-by: Guilherme Gallo <[email protected]> Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15208> --- .gitlab-ci/container/lava_build.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index d3cfecbc481..620c7953284 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -52,7 +52,7 @@ else DEFCONFIG="arch/x86/configs/x86_64_defconfig" DEVICE_TREES="" KERNEL_IMAGE_NAME="bzImage" - ARCH_PACKAGES="libva-dev" + ARCH_PACKAGES="libasound2-dev libcap-dev libfdt-dev libva-dev wayland-protocols" fi # Determine if we're in a cross build. @@ -129,7 +129,7 @@ fi ############### Building STRIP_CMD="${GCC_ARCH}-strip" -mkdir -p /lava-files/rootfs-${DEBIAN_ARCH} +mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH ############### Build apitrace @@ -168,6 +168,13 @@ if [[ "$DEBIAN_ARCH" = "amd64" ]]; then mv /va/bin/* /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/ fi +############### Build Crosvm +if [[ ${DEBIAN_ARCH} = "amd64" ]]; then + . .gitlab-ci/container/build-crosvm.sh + mv /usr/local/bin/crosvm /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/ + mv /usr/local/lib/$GCC_ARCH/libvirglrenderer.* /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH/ +fi + ############### Build libdrm EXTRA_MESON_ARGS+=" -D prefix=/libdrm" . .gitlab-ci/container/build-libdrm.sh @@ -202,7 +209,6 @@ rm /lava-files/rootfs-${DEBIAN_ARCH}/create-rootfs.sh # Dependencies pulled during the creation of the rootfs may overwrite # the built libdrm. Hence, we add it after the rootfs has been already # created. -mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH find /libdrm/ -name lib\*\.so\* | xargs cp -t /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH/. mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/libdrm/ cp -Rp /libdrm/share /lava-files/rootfs-${DEBIAN_ARCH}/libdrm/share
