OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/lava: Add firmware-misc-nonfree on amd64

Browse Source 
Hopefully this provides the GuC firmware files we need for testing on
Intel ADL+ boards.

Related: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9841
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25792>
This commit is contained in:
Matt Turner
2023-10-18 13:53:30 -04:00
committed by Marge Bot
parent 2132f95de0
commit 6d2be84672
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci/container/lava_build.sh
View File

@@ -194,6 +194,7 @@ PKG_DEP=(
) )
[ "$DEBIAN_ARCH" = "amd64" ] && PKG_ARCH=( [ "$DEBIAN_ARCH" = "amd64" ] && PKG_ARCH=(
firmware-amd-graphics firmware-amd-graphics
firmware-misc-nonfree
libgl1 libglu1-mesa libgl1 libglu1-mesa
inetutils-syslogd iptables libcap2 inetutils-syslogd iptables libcap2
libfontconfig1 libfontconfig1
@@ -320,6 +321,11 @@ fi
rm -rf /root/.cargo rm -rf /root/.cargo
rm -rf /root/.rustup rm -rf /root/.rustup
############### Delete firmware files we don't need
if [ "$DEBIAN_ARCH" = "amd64" ]; then
dpkg -L firmware-misc-nonfree | grep -v "i915" | xargs rm || true
fi
############### Fill rootfs ############### Fill rootfs
cp .gitlab-ci/container/setup-rootfs.sh $ROOTFS/. cp .gitlab-ci/container/setup-rootfs.sh $ROOTFS/.
cp .gitlab-ci/container/strip-rootfs.sh $ROOTFS/. cp .gitlab-ci/container/strip-rootfs.sh $ROOTFS/.

2
.gitlab-ci/image-tags.yml
View File

@@ -25,7 +25,7 @@ variables:
ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv" ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv"
ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
FEDORA_X86_64_BUILD_TAG: "2023-10-30-ci-improv" FEDORA_X86_64_BUILD_TAG: "2023-10-30-ci-improv"
KERNEL_ROOTFS_TAG: "2023-12-08-vkd3d" KERNEL_ROOTFS_TAG: "2023-12-08-firmware"
KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
KERNEL_REPO: "gfx-ci/linux" KERNEL_REPO: "gfx-ci/linux"