Try #591: --target unknown-linux

cross-rs · Mar 18, 2022 · 32fff79 · 32fff79
2 parents e93eb2f + 87560cc
commit 32fff79
Show file tree

Hide file tree

Showing 21 changed files with 64 additions and 32 deletions.
diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabi b/docker/Dockerfile.arm-unknown-linux-gnueabi
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh
@@ -9,12 +9,8 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
-RUN mkdir /usr/arm-linux-gnueabihf \
- && cd /usr/arm-linux-gnueabihf \
- && export TOOLCHAIN_VERSION=8.3-2019.03 \
- && curl --retry 3 -sSfL https://developer.arm.com/-/media/Files/downloads/gnu-a/${TOOLCHAIN_VERSION}/binrel/gcc-arm-${TOOLCHAIN_VERSION}-x86_64-arm-linux-gnueabihf.tar.xz -O \
- && tar --strip-components 1 -xJf gcc-arm-${TOOLCHAIN_VERSION}-x86_64-arm-linux-gnueabihf.tar.xz \
- && rm gcc-arm-${TOOLCHAIN_VERSION}-x86_64-arm-linux-gnueabihf.tar.xz
+COPY arm-unknown-linux-gnueabihf.sh /
+RUN /arm-unknown-linux-gnueabihf.sh
 
 ENV PATH /usr/arm-linux-gnueabihf/bin:$PATH
 

diff --git a/docker/Dockerfile.armv5te-unknown-linux-gnueabi b/docker/Dockerfile.armv5te-unknown-linux-gnueabi
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.i586-unknown-linux-gnu b/docker/Dockerfile.i586-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.i686-pc-windows-gnu b/docker/Dockerfile.i686-pc-windows-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.i686-unknown-linux-gnu b/docker/Dockerfile.i686-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.mips-unknown-linux-gnu b/docker/Dockerfile.mips-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.mips64-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64-unknown-linux-gnuabi64
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.mipsel-unknown-linux-gnu b/docker/Dockerfile.mipsel-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.powerpc-unknown-linux-gnu b/docker/Dockerfile.powerpc-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.powerpc64-unknown-linux-gnu b/docker/Dockerfile.powerpc64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.powerpc64le-unknown-linux-gnu b/docker/Dockerfile.powerpc64le-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.riscv64gc-unknown-linux-gnu b/docker/Dockerfile.riscv64gc-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.s390x-unknown-linux-gnu b/docker/Dockerfile.s390x-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.sparc64-unknown-linux-gnu b/docker/Dockerfile.sparc64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY common.sh lib.sh /
 RUN /common.sh

diff --git a/docker/Dockerfile.x86_64-unknown-linux-gnu b/docker/Dockerfile.x86_64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 COPY linux-image.sh /
 RUN /linux-image.sh x86_64

diff --git a/docker/arm-unknown-linux-gnueabihf.sh b/docker/arm-unknown-linux-gnueabihf.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -x
+set -euo pipefail
+
+main() {
+    mkdir /usr/arm-linux-gnueabihf
+    cd /usr/arm-linux-gnueabihf
+
+    local dependencies=(xz-utils)
+    apt-get update
+    local purge_list=()
+    for dep in "${dependencies[@]}"; do
+        if ! dpkg -L "${dep}"; then
+            apt-get install --assume-yes --no-install-recommends "${dep}"
+            purge_list+=( "${dep}" )
+        fi
+    done
+
+    local toolchain_version=8.3-2019.03
+    curl --retry 3 -sSfL https://developer.arm.com/-/media/Files/downloads/gnu-a/${toolchain_version}/binrel/gcc-arm-${toolchain_version}-x86_64-arm-linux-gnueabihf.tar.xz -O
+    tar --strip-components 1 -xJf gcc-arm-${toolchain_version}-x86_64-arm-linux-gnueabihf.tar.xz
+    rm gcc-arm-${toolchain_version}-x86_64-arm-linux-gnueabihf.tar.xz
+
+    if (( ${#purge_list[@]} )); then
+      apt-get purge --assume-yes --auto-remove "${purge_list[@]}"
+    fi
+}
+
+main "${@}"
diff --git a/docker/linux-image.sh b/docker/linux-image.sh
@@ -6,16 +6,16 @@ set -euo pipefail
 main() {
     # arch in the rust target
     local arch="${1}" \
-          kversion=4.19.0-17
+          kversion=5.10.0-8
 
-    local debsource="deb http://http.debian.net/debian/ buster main"
-    debsource="${debsource}\ndeb http://security.debian.org/ buster/updates main"
+    local debsource="deb http://http.debian.net/debian/ bullseye main"
+    debsource="${debsource}\ndeb http://security.debian.org/ bullseye-security main"
 
     local dropbear="dropbear-bin"
 
     local -a deps
     local kernel=
-    local libgcc="libgcc1"
+    local libgcc="libgcc-s1"
 
     # select debian arch and kernel version
     case "${arch}" in
@@ -31,7 +31,14 @@ main() {
             arch=i386
             kernel="${kversion}-686"
             ;;
-        mips|mipsel)
+        mips)
+            # mips was discontinued in bullseye, so we have to use buster.
+            libgcc="libgcc1"
+            debsource="deb http://http.debian.net/debian/ buster main"
+            debsource="${debsource}\ndeb http://security.debian.org/ buster/updates main"
+            kernel=4.19.0-14-4kc-malta
+            ;;
+        mipsel)
             kernel="${kversion}-4kc-malta"
             ;;
         mips64el)
@@ -59,8 +66,8 @@ main() {
             arch=ppc64
             # https://packages.debian.org/en/sid/linux-image-powerpc64
             kversion='5.*'
-            kernel="${kversion}-powerpc64"
             libgcc="libgcc-s1"
+            kernel='*-powerpc64'
             debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
             debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
             # sid version of dropbear requires these dependencies
@@ -78,7 +85,6 @@ main() {
             # there is no stable port
             # https://packages.debian.org/en/sid/linux-image-sparc64
             kernel='*-sparc64'
-            libgcc="libgcc-s1"
             debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
             debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
             # sid version of dropbear requires these dependencies