ci: Upgrade to libdrm 2.4.109
Required for being able to use drmGetDeviceFromDevId in the loader. Signed-off-by: Daniel Stone <daniels@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11248>
This commit is contained in:
Daniel Stone
Marge Bot
parent
a2fd507973
commit
be1acac84c
|
|
@ -290,7 +290,7 @@ debian/x86_build-base:
|
|||
- .fdo.container-build@debian
|
||||
- .container
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-x86_build-base "2021-11-25-wayland"
|
||||
MESA_IMAGE_TAG: &debian-x86_build-base "2021-11-25-libdrm"
|
||||
|
||||
.use-debian/x86_build-base:
|
||||
extends:
|
||||
|
|
@ -308,7 +308,7 @@ debian/x86_build:
|
|||
extends:
|
||||
- .use-debian/x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-x86_build "2021-07-02-bump-libdrm"
|
||||
MESA_IMAGE_TAG: &debian-x86_build "2021-11-25-libdrm"
|
||||
|
||||
.use-debian/x86_build:
|
||||
extends:
|
||||
|
|
@ -325,7 +325,7 @@ debian/i386_build:
|
|||
extends:
|
||||
- .use-debian/x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-i386_build "2021-07-02-bump-libdrm"
|
||||
MESA_IMAGE_TAG: &debian-i386_build "2021-11-25-libdrm"
|
||||
|
||||
.use-debian/i386_build:
|
||||
extends:
|
||||
|
|
@ -342,7 +342,7 @@ debian/ppc64el_build:
|
|||
extends:
|
||||
- .use-debian/x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-ppc64el_build "2021-07-02-bump-libdrm"
|
||||
MESA_IMAGE_TAG: &debian-ppc64el_build "2021-11-25-libdrm"
|
||||
|
||||
.use-debian/ppc64el_build:
|
||||
extends:
|
||||
|
|
@ -359,7 +359,7 @@ debian/s390x_build:
|
|||
extends:
|
||||
- .use-debian/x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-s390x_build "2021-07-02-bump-libdrm"
|
||||
MESA_IMAGE_TAG: &debian-s390x_build "2021-11-25-libdrm"
|
||||
|
||||
.use-debian/s390x_build:
|
||||
extends:
|
||||
|
|
@ -376,7 +376,7 @@ debian/android_build:
|
|||
extends:
|
||||
- .use-debian/x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-android_build "2021-10-26-static-libstdcxx"
|
||||
MESA_IMAGE_TAG: &debian-android_build "2021-11-25-libdrm"
|
||||
|
||||
.use-debian/android_build:
|
||||
extends:
|
||||
|
|
@ -392,7 +392,7 @@ debian/android_build:
|
|||
debian/x86_test-base:
|
||||
extends: debian/x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-x86_test-base "2021-10-15-va"
|
||||
MESA_IMAGE_TAG: &debian-x86_test-base "2021-11-25-libdrm"
|
||||
|
||||
.use-debian/x86_test-base:
|
||||
extends:
|
||||
|
|
@ -410,13 +410,13 @@ debian/x86_test-gl:
|
|||
variables:
|
||||
FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
|
||||
KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2"
|
||||
MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-25-wayland"
|
||||
MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-25-libdrm"
|
||||
|
||||
# Debian 11 based x86 test image for VK
|
||||
debian/x86_test-vk:
|
||||
extends: .use-debian/x86_test-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-x86_test-vk "2021-11-25-wayland"
|
||||
MESA_IMAGE_TAG: &debian-x86_test-vk "2021-11-25-libdrm"
|
||||
|
||||
# Debian 11 based ARM build image
|
||||
debian/arm_build:
|
||||
|
|
@ -426,7 +426,7 @@ debian/arm_build:
|
|||
tags:
|
||||
- aarch64
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &debian-arm_build "2021-07-26-python"
|
||||
MESA_IMAGE_TAG: &debian-arm_build "2021-11-25-libdrm"
|
||||
|
||||
.use-debian/arm_build:
|
||||
extends:
|
||||
|
|
@ -446,7 +446,7 @@ fedora/x86_build:
|
|||
- .container
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: 34
|
||||
MESA_IMAGE_TAG: &fedora-x86_build "2021-11-25-wayland"
|
||||
MESA_IMAGE_TAG: &fedora-x86_build "2021-11-25-libdrm"
|
||||
|
||||
.use-fedora/x86_build:
|
||||
extends:
|
||||
|
|
@ -465,7 +465,7 @@ fedora/x86_build:
|
|||
variables:
|
||||
GIT_STRATEGY: fetch
|
||||
KERNEL_URL: *kernel-rootfs-url
|
||||
MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-02-deqp"
|
||||
MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-25-libdrm"
|
||||
DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
|
||||
script:
|
||||
- .gitlab-ci/container/lava_build.sh
|
||||
|
|
@ -519,7 +519,7 @@ debian/arm_test:
|
|||
FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
|
||||
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
|
||||
MESA_ARM_BUILD_TAG: *debian-arm_build
|
||||
MESA_IMAGE_TAG: &debian-arm_test "2021-09-17-deqp"
|
||||
MESA_IMAGE_TAG: &debian-arm_test "2021-11-25-libdrm"
|
||||
MESA_ROOTFS_TAG: *kernel-rootfs
|
||||
|
||||
.use-debian/arm_test:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
set -ex
|
||||
|
||||
export LIBDRM_VERSION=libdrm-2.4.107
|
||||
export LIBDRM_VERSION=libdrm-2.4.109
|
||||
|
||||
wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
|
||||
tar -xvf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi
|
|||
|
||||
# Not using build-libdrm.sh because we don't want its cleanup after building
|
||||
# each arch. Fetch and extract now.
|
||||
export LIBDRM_VERSION=libdrm-2.4.107
|
||||
export LIBDRM_VERSION=libdrm-2.4.109
|
||||
wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
|
||||
tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue