From 55bdb61b48a01e9a7c6efb4622fecab2411c0287 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Mon, 30 Mar 2020 20:09:45 -0400 Subject: [PATCH] Deduplicate crosstool-ng.sh --- src/ci/docker/dist-arm-linux/Dockerfile | 4 ++-- src/ci/docker/dist-armhf-linux/Dockerfile | 4 ++-- src/ci/docker/dist-armhf-linux/crosstool-ng.sh | 12 ------------ src/ci/docker/dist-armv7-linux/Dockerfile | 4 ++-- src/ci/docker/dist-armv7-linux/crosstool-ng.sh | 12 ------------ .../crosstool-ng.sh => scripts/crosstool-ng-1.24.sh} | 0 6 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 src/ci/docker/dist-armhf-linux/crosstool-ng.sh delete mode 100644 src/ci/docker/dist-armv7-linux/crosstool-ng.sh rename src/ci/docker/{dist-arm-linux/crosstool-ng.sh => scripts/crosstool-ng-1.24.sh} (100%) diff --git a/src/ci/docker/dist-arm-linux/Dockerfile b/src/ci/docker/dist-arm-linux/Dockerfile index 028f693299c97..50f7ca74e545a 100644 --- a/src/ci/docker/dist-arm-linux/Dockerfile +++ b/src/ci/docker/dist-arm-linux/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:16.04 COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh -COPY dist-arm-linux/crosstool-ng.sh /scripts/ -RUN sh /scripts/crosstool-ng.sh +COPY scripts/crosstool-ng-1.24.sh /scripts/ +RUN sh /scripts/crosstool-ng-1.24.sh COPY scripts/rustbuild-setup.sh /scripts/ RUN sh /scripts/rustbuild-setup.sh diff --git a/src/ci/docker/dist-armhf-linux/Dockerfile b/src/ci/docker/dist-armhf-linux/Dockerfile index 1ec3204eedba3..209b6c166ebb7 100644 --- a/src/ci/docker/dist-armhf-linux/Dockerfile +++ b/src/ci/docker/dist-armhf-linux/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:16.04 COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh -COPY dist-armhf-linux/crosstool-ng.sh /scripts/ -RUN sh /scripts/crosstool-ng.sh +COPY scripts/crosstool-ng-1.24.sh /scripts/ +RUN sh /scripts/crosstool-ng-1.24.sh COPY scripts/rustbuild-setup.sh /scripts/ RUN sh /scripts/rustbuild-setup.sh diff --git a/src/ci/docker/dist-armhf-linux/crosstool-ng.sh b/src/ci/docker/dist-armhf-linux/crosstool-ng.sh deleted file mode 100644 index fb067a79a5c85..0000000000000 --- a/src/ci/docker/dist-armhf-linux/crosstool-ng.sh +++ /dev/null @@ -1,12 +0,0 @@ -set -ex - -# Mirrored from https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-1.24.0.tar.gz -url="https://ci-mirrors.rust-lang.org/rustc/crosstool-ng-1.24.0.tar.gz" -curl -Lf $url | tar xzf - -cd crosstool-ng-crosstool-ng-1.24.0 -./bootstrap -./configure --prefix=/usr/local -make -j$(nproc) -make install -cd .. -rm -rf crosstool-ng-crosstool-ng-1.24.0 diff --git a/src/ci/docker/dist-armv7-linux/Dockerfile b/src/ci/docker/dist-armv7-linux/Dockerfile index 417171a861d4a..f42a2bd8122d7 100644 --- a/src/ci/docker/dist-armv7-linux/Dockerfile +++ b/src/ci/docker/dist-armv7-linux/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:16.04 COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh -COPY dist-armv7-linux/crosstool-ng.sh /scripts/ -RUN sh /scripts/crosstool-ng.sh +COPY scripts/crosstool-ng-1.24.sh /scripts/ +RUN sh /scripts/crosstool-ng-1.24.sh COPY scripts/rustbuild-setup.sh /scripts/ RUN sh /scripts/rustbuild-setup.sh diff --git a/src/ci/docker/dist-armv7-linux/crosstool-ng.sh b/src/ci/docker/dist-armv7-linux/crosstool-ng.sh deleted file mode 100644 index fb067a79a5c85..0000000000000 --- a/src/ci/docker/dist-armv7-linux/crosstool-ng.sh +++ /dev/null @@ -1,12 +0,0 @@ -set -ex - -# Mirrored from https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-1.24.0.tar.gz -url="https://ci-mirrors.rust-lang.org/rustc/crosstool-ng-1.24.0.tar.gz" -curl -Lf $url | tar xzf - -cd crosstool-ng-crosstool-ng-1.24.0 -./bootstrap -./configure --prefix=/usr/local -make -j$(nproc) -make install -cd .. -rm -rf crosstool-ng-crosstool-ng-1.24.0 diff --git a/src/ci/docker/dist-arm-linux/crosstool-ng.sh b/src/ci/docker/scripts/crosstool-ng-1.24.sh similarity index 100% rename from src/ci/docker/dist-arm-linux/crosstool-ng.sh rename to src/ci/docker/scripts/crosstool-ng-1.24.sh