Module: Mesa Branch: main Commit: 2bd17f832ce7fc022f21d4cad213752c5959dd12 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2bd17f832ce7fc022f21d4cad213752c5959dd12
Author: David Heidelberg <[email protected]> Date: Thu Apr 20 15:29:27 2023 +0200 ci: add a660 firmware into rootfs Until we bump to Debian 12 (bookworm). Acked-by: Emma Anholt <[email protected]> Reviewed-by: Daniel Stone <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22604> --- .gitlab-ci/container/debian/arm_test.sh | 6 +++++- .gitlab-ci/container/lava_build.sh | 15 +++++++++++++++ .gitlab-ci/image-tags.yml | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/debian/arm_test.sh b/.gitlab-ci/container/debian/arm_test.sh index bb0d89b911d..164562322db 100644 --- 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 68c7acf7b37..ce684c1d24b 100755 --- 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 d63dbc4f71b..2aed20dd8e4 100644 --- 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"
