Module: Mesa Branch: main Commit: cd39a5ac8b08f12a25d20a379527aba5323fa19b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd39a5ac8b08f12a25d20a379527aba5323fa19b
Author: Corentin Noël <[email protected]> Date: Wed Mar 8 17:15:46 2023 +0100 ci: uprev virglrenderer and crosvm Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21794> --- .gitlab-ci/container/build-crosvm.sh | 10 ++++++++-- .gitlab-ci/image-tags.yml | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index cddcaf931e9..033e78906bc 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -6,13 +6,19 @@ set -ex git config --global user.email "[email protected]" git config --global user.name "Mesa CI" -CROSVM_VERSION=504899212d626ecf42b1c459e5592891dde5bf91 +CROSVM_VERSION=7784d7dbad81ce2e7ec448ec7e821728a2d4ae72 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -VIRGLRENDERER_VERSION=49d4d0fe3eda5fa998b950809d4e9958f0d52da4 +# Revert "minijail: remove MS_NOSYMFOLLOW def because ChromeOS is now on glibc 2.35." +# Debian Bullseye has only glibc 2.31 +pushd third_party/minijail +git cherry-pick 0bbf93fdc58520525c85f311c176219bb1b4e96f +popd + +VIRGLRENDERER_VERSION=f0e07bfd20ac6672643dfaf5e08318d8ec803750 rm -rf third_party/virglrenderer git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer pushd third_party/virglrenderer diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 102c32b24dd..af92f83e531 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2023-02-23-virglrenderer" + DEBIAN_BASE_TAG: "2023-03-13-virglrenderer-crosvm" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2023-02-14-pip" @@ -21,7 +21,7 @@ variables: ALPINE_X86_BUILD_TAG: "2023-02-26-add-bash-coreutils" FEDORA_X86_BUILD_TAG: "2023-02-09-f36" - KERNEL_ROOTFS_TAG: "2023-03-02-uprev-deqp" + KERNEL_ROOTFS_TAG: "2023-03-13-virglrenderer-crosvm" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
