diff options
| author | bors <bors@rust-lang.org> | 2019-03-30 08:32:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-30 08:32:13 +0000 |
| commit | 6c49da45441d29aadd5935dabbaa8dc09ebad33a (patch) | |
| tree | e3d8f54b557abdf322de702d4757293149e687c5 /src/ci | |
| parent | 709b72e7a73cbb798b728fd84c384bd0ad8ebf6c (diff) | |
| parent | 62a78c4fcfca82cbdcdd13a5298885bd21e5d4d9 (diff) | |
| download | rust-6c49da45441d29aadd5935dabbaa8dc09ebad33a.tar.gz rust-6c49da45441d29aadd5935dabbaa8dc09ebad33a.zip | |
Auto merge of #59550 - Centril:rollup, r=Centril
Rollup of 10 pull requests Successful merges: - #59376 (RFC 2008: Enum Variants) - #59453 (Recover from parse error in tuple syntax) - #59455 (Account for short-hand field syntax when suggesting borrow) - #59499 (Fix broken download link in the armhf-gnu image) - #59512 (implement `AsRawFd` for stdio locks) - #59525 (Whitelist some rustc attrs) - #59528 (Improve the dbg! macro docs ) - #59532 (In doc examples, don't ignore read/write results) - #59534 (rustdoc: collapse blanket impls in the same way as normal impls) - #59537 (Fix OnceWith docstring.) Failed merges: r? @ghost
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/armhf-gnu/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ci/docker/armhf-gnu/Dockerfile b/src/ci/docker/armhf-gnu/Dockerfile index 2b7624d53ee..e4c2097f970 100644 --- a/src/ci/docker/armhf-gnu/Dockerfile +++ b/src/ci/docker/armhf-gnu/Dockerfile @@ -71,7 +71,8 @@ COPY scripts/qemu-bare-bones-addentropy.c /tmp/addentropy.c RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static # TODO: What is this?! -RUN curl -O http://ftp.nl.debian.org/debian/dists/jessie/main/installer-armhf/current/images/device-tree/vexpress-v2p-ca15-tc1.dtb +# Source of the file: https://github.com/vfdev-5/qemu-rpi2-vexpress/raw/master/vexpress-v2p-ca15-tc1.dtb +RUN curl -O https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/vexpress-v2p-ca15-tc1.dtb COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh |