diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 02efbf03814..e5205302798 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -15,13 +15,13 @@ uncollapsed_section_start crosvm "Building crosvm" git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" -CROSVM_VERSION=10d2f33440475cb1a96eba1dc27c59c8b57b68bd +CROSVM_VERSION=e27efaf8f4bdc4a47d1e99cc44d2b6908b6f36bd 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=5b116c35ae08897b4d5171d8ed4cb0e73fb18069 +VIRGLRENDERER_VERSION=4a6af3135ca727dc158ec003dae7ca8571a7efb6 rm -rf third_party/virglrenderer git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer pushd third_party/virglrenderer @@ -30,14 +30,14 @@ meson setup build/ -D libdir=lib -D render-server-worker=process -D venus=true $ meson install -C build popd -cargo update -p pkg-config@0.3.26 --precise 0.3.27 +rm rust-toolchain RUSTFLAGS='-L native=/usr/local/lib' cargo install \ bindgen-cli \ --locked \ -j ${FDO_CI_CONCURRENT:-4} \ --root /usr/local \ - --version 0.65.1 \ + --version 0.71.1 \ ${EXTRA_CARGO_ARGS:-} CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \ diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh index c8746688b58..3d4f2c67f3f 100644 --- a/.gitlab-ci/container/build-rust.sh +++ b/.gitlab-ci/container/build-rust.sh @@ -27,7 +27,7 @@ rustup component add clippy rustfmt # Set up a config script for cross compiling -- cargo needs your system cc for # linking in cross builds, but doesn't know what you want to use for system cc. -cat > /root/.cargo/config < "$HOME/.cargo/config" <