From 295243751f046b067644845d4da9be653062a25a Mon Sep 17 00:00:00 2001
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Date: Thu, 28 Oct 2021 22:25:09 +0300
Subject: [PATCH] ci: Add crosvm runtime dependencies for LAVA

Provide the required packages in the rootfs image in order to allow
running crosvm inside LAVA environment.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15208>
---
 .gitlab-ci/container/create-rootfs.sh | 7 +++++++
 .gitlab-ci/image-tags.yml             | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 67ede7b997e..8613901ed0c 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -12,10 +12,17 @@ if [ $DEBIAN_ARCH = arm64 ]; then
     "
 elif [ $DEBIAN_ARCH = amd64 ]; then
     ARCH_PACKAGES="firmware-amd-graphics
+                   inetutils-syslogd
+                   iptables
+                   libcap2
                    libelf1
+                   libfdt1
                    libllvm11
                    libva2
                    libva-drm2
+                   socat
+                   spirv-tools
+                   sysvinit-core
                   "
 fi
 
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index e7cc3611d6b..c8e770770d3 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -12,7 +12,7 @@ variables:
    DEBIAN_X86_TEST_VK_TAG: "2022-02-21-libdrm"
 
    FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5"
-   KERNEL_ROOTFS_TAG: "2022-03-03-nouveau"
+   KERNEL_ROOTFS_TAG: "2022-03-04-crosvm-lava"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
    WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"