mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-25 13:23:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

upgrade rust and rustup version used in Docker

Browse source 
This change also fixes a warning with the drm repo URL being redirected.

The warning about detached HEADs while building the crosvm-base image is
supressed.

BUG=None
TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh

Change-Id: Ia0d39717769d53ec43bf120b2100dd7b9fa9acfb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2295844
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Auto-Submit: Zach Reizner <zachr@chromium.org>
This commit is contained in:
Zach Reizner 2020-07-13 13:24:25 -07:00 committed by Commit Bot
parent dbf8f9ca0e
commit f62b22c7bf
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docker/Dockerfile
View file

@ -35,13 +35,13 @@ RUN apt-get update && apt-get install -y \
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
RUST_VERSION=1.42.0 \
RUST_VERSION=1.44.1 \
RUSTFLAGS='--cfg hermetic'
# Debian usually has an old rust version in the repository. Instead of using that, we use rustup to
# pull in a toolchain versions of our choosing.
RUN curl -LO "https://static.rust-lang.org/rustup/archive/1.21.1/x86_64-unknown-linux-gnu/rustup-init" \
&& echo "ad1f8b5199b3b9e231472ed7aa08d2e5d1d539198a15c5b1e53c746aad81d27b *rustup-init" | sha256sum -c - \
RUN curl -LO "https://static.rust-lang.org/rustup/archive/1.22.1/x86_64-unknown-linux-gnu/rustup-init" \
&& echo "49c96f3f74be82f4752b8bffcf81961dea5e6e94ce1ccba94435f12e871c3bdb *rustup-init" | sha256sum -c - \
&& chmod +x rustup-init \
&& ./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION \
&& rm rustup-init \
@ -57,6 +57,9 @@ RUN cargo install thisiznotarealpackage -q || true
# Used /scratch for building dependencies which are too new or don't exist on Debian stretch.
WORKDIR /scratch
# Suppress warnings about detached HEAD, which will happen a lot and is meaningless in this context.
RUN git config --global advice.detachedHead false
# New libepoxy and libdrm-dev requires newer meson than is in Debian stretch.
ARG MESON_COMMIT=master
RUN git clone https://github.com/mesonbuild/meson \
@ -67,7 +70,7 @@ RUN git clone https://github.com/mesonbuild/meson \
# The libdrm-dev in distro can be too old to build minigbm,
# so we build it from upstream.
ARG DRM_COMMIT=master
RUN git clone https://gitlab.freedesktop.org/mesa/drm \
RUN git clone https://gitlab.freedesktop.org/mesa/drm.git/ \
&& cd drm \
&& git checkout $DRM_COMMIT \
&& meson build \

2
docker/upgrade_checkout_commits.sh
View file

@ -11,7 +11,7 @@ remotes=(
"https://chromium.googlesource.com/chromiumos/third_party/tpm2"
"https://chromium.googlesource.com/chromiumos/platform2"
"https://chromium.googlesource.com/chromiumos/third_party/adhd"
"https://gitlab.freedesktop.org/mesa/drm"
"https://gitlab.freedesktop.org/mesa/drm.git/"
"https://android.googlesource.com/platform/external/minijail"
)