ci: add a660 firmware into rootfs

Until we bump to Debian 12 (bookworm).

Acked-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22604>

diff --git a/.gitlab-ci/container/debian/arm_test.sh b/.gitlab-ci/container/debian/arm_test.sh
index bb0d89b..1645623 100644 (file)
--- a/.gitlab-ci/container/debian/arm_test.sh
+++ b/.gitlab-ci/container/debian/arm_test.sh
@@ -1,5 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2154 # arch is assigned in previous scripts
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BASE_TAG
+# KERNEL_ROOTFS_TAG
 
 set -e
 set -o xtrace

diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 68c7acf..ce684c1 100755 (executable)
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -2,6 +2,9 @@
 # shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
 # shellcheck disable=SC2034 # Variables are used in scripts called from here
 # shellcheck disable=SC2086 # we want word splitting
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# KERNEL_ROOTFS_TAG
 
 set -e
 set -o xtrace
@@ -258,6 +261,18 @@ rm $ROOTFS/{llvm-snapshot,winehq}.gpg.key
 rm $ROOTFS/create-rootfs.sh
 cp /etc/wgetrc $ROOTFS/etc/.
 
+############### Inject missing firmwares from Debian 11
+if [[ "$DEBIAN_ARCH" == "arm64" ]]; then
+  # This A660 firmware is included from Debian 12 (bookworm) up
+  mkdir -p /lava-files/rootfs-arm64/lib/firmware/qcom/sm8350/  # for firmware imported later
+  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+    "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a660_gmu.bin?id=8451c2b1d529dc1a49328ac9235d3cf5bb8a8fcb" \
+    -o /lava-files/rootfs-arm64/lib/firmware/qcom/a660_gmu.bin
+  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+    "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a660_sqe.fw?id=8451c2b1d529dc1a49328ac9235d3cf5bb8a8fcb" \
+    -o /lava-files/rootfs-arm64/lib/firmware/qcom/a660_sqe.fw
+fi
+
 
 ############### Install the built libdrm
 # Dependencies pulled during the creation of the rootfs may overwrite

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index d63dbc4..2aed20d 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -21,7 +21,7 @@ variables:
 
    ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump"
    FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng"
-   KERNEL_ROOTFS_TAG: "2023-04-24-deqp"
+   KERNEL_ROOTFS_TAG: "2023-04-25-a660-firmware"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"