Fix powerpc64-unknown-linux-gnu and sparc64-unknown-linux-gnu

malbarbo · Oct 23, 2020 · 366a3e4 · 366a3e4
1 parent e88c7b2
commit 366a3e4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 - Added support for mounting volumes.
+- Re-enabled `powerpc64-unknown-linux-gnu` image
+- Re-enabled `sparc64-unknown-linux-gnu` image
 
 ## [v0.2.1] - 2020-06-30
 

diff --git a/README.md b/README.md
@@ -277,9 +277,11 @@ terminate.
 | `mipsel-unknown-linux-gnu`           | 2.23   | 5.3.1   | ✓   | 4.1.0 |   ✓    |
 | `mipsel-unknown-linux-musl`          | 1.1.20 | 6.3.0   | ✓   | 4.1.0 |   ✓    |
 | `powerpc-unknown-linux-gnu`          | 2.19   | 4.8.2   | ✓   | 3.0.1 |   ✓    |
+| `powerpc64-unknown-linux-gnu`        | 2.31   | 10.2.0  | ✓   | 3.0.1 |   ✓    |
 | `powerpc64le-unknown-linux-gnu`      | 2.19   | 4.8.2   | ✓   | 3.0.1 |   ✓    |
 | `riscv64gc-unknown-linux-gnu`        | 2.27   | 7.5.0   | ✓   | 4.2.0 |   ✓    |
 | `s390x-unknown-linux-gnu`            | 2.23   | 5.3.1   | ✓   | 4.1.0 |        |
+| `sparc64-unknown-linux-gnu`          | 2.31   | 10.2.0  | ✓   | 4.2.0 |   ✓    |
 | `sparcv9-sun-solaris` [4]            | 2.11   | 5.3.0   | ✓   | N/A   |        |
 | `thumbv6m-none-eabi` [5]             | 2.2.0  | 5.3.1   |     | N/A   |        |
 | `thumbv7em-none-eabi` [5]            | 2.2.0  | 5.3.1   |     | N/A   |        |

diff --git a/...ed/Dockerfile.powerpc64-unknown-linux-gnu → ...er/Dockerfile.powerpc64-unknown-linux-gnu b/...ed/Dockerfile.powerpc64-unknown-linux-gnu → ...er/Dockerfile.powerpc64-unknown-linux-gnu
diff --git a/...bled/Dockerfile.sparc64-unknown-linux-gnu → docker/Dockerfile.sparc64-unknown-linux-gnu b/...bled/Dockerfile.sparc64-unknown-linux-gnu → docker/Dockerfile.sparc64-unknown-linux-gnu
diff --git a/docker/linux-image.sh b/docker/linux-image.sh
@@ -15,6 +15,7 @@ main() {
 
     local -a deps
     local kernel=
+    local libgcc="libgcc1"
 
     # select debian arch and kernel version
     case "${arch}" in
@@ -56,10 +57,11 @@ main() {
             arch=ppc64
             # https://packages.debian.org/en/sid/linux-image-powerpc64
             kernel='*-powerpc64'
+            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
-            deps=(libtommath1:ppc64 libtomcrypt1:ppc64 libgmp10:ppc64)
+            deps=(libtommath1:ppc64 libtomcrypt1:ppc64 libgmp10:ppc64 libcrypt1:ppc64)
             ;;
         powerpc64le)
             arch=ppc64el
@@ -73,10 +75,11 @@ 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
-            deps=(libtommath1:sparc64 libtomcrypt1:sparc64 libgmp10:sparc64)
+            deps=(libtommath1:sparc64 libtomcrypt1:sparc64 libgmp10:sparc64 libcrypt1:sparc64)
             ;;
         x86_64)
             arch=amd64
@@ -135,7 +138,7 @@ main() {
         "busybox:${arch}" \
         "${dropbear}:${arch}" \
         "libc6:${arch}" \
-        "libgcc1:${arch}" \
+        "${libgcc}:${arch}" \
         "libstdc++6:${arch}" \
         "linux-image-${kernel}:${arch}" \
         ncurses-base \