Merge #984

984: Add Linux images for `riscv64gc-unknown-linux-gnu`. r=Emilgardis a=Alexhuszagh



Co-authored-by: Alex Huszagh <[email protected]>

Author: bors[bot]

.changes/984.json

@@ -0,0 +1,4 @@
+{
+    "description": "added linux images for `riscv64gc-unknown-linux-gnu` to allow full system emulation.",
+    "type": "added"
+}

.github/workflows/ci.yml

@@ -172,7 +172,7 @@ jobs:
             - { target: powerpc-unknown-linux-gnu,        os: ubuntu-latest,  cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
             - { target: powerpc64-unknown-linux-gnu,      os: ubuntu-latest,  cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
             - { target: powerpc64le-unknown-linux-gnu,    os: ubuntu-latest,  cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
-            - { target: riscv64gc-unknown-linux-gnu,      os: ubuntu-latest,  cpp: 1,           std: 1, run: 1 }
+            - { target: riscv64gc-unknown-linux-gnu,      os: ubuntu-latest,  cpp: 1,           std: 1, run: 1, runners: qemu-user qemu-system }
             - { target: s390x-unknown-linux-gnu,          os: ubuntu-latest,  cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
             - { target: sparc64-unknown-linux-gnu,        os: ubuntu-latest,  cpp: 1, dylib: 1, std: 1, run: 1, runners: qemu-user qemu-system }
             - { target: aarch64-unknown-linux-musl,       os: ubuntu-latest,  cpp: 1, dylib: 1, std: 1, run: 1 }

docker/Dockerfile.riscv64gc-unknown-linux-gnu

@@ -4,8 +4,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 COPY common.sh lib.sh /
 RUN /common.sh
 
-# COPY cmake.sh /
-# RUN /cmake.sh
+COPY cmake.sh /
+RUN /cmake.sh
 
 COPY xargo.sh /
 RUN /xargo.sh
@@ -20,7 +20,13 @@ RUN TARGET_ARCH=riscv64 /deny-debian-packages.sh \
     binutils-riscv64-linux-gnu
 
 COPY qemu.sh /
-RUN /qemu.sh riscv64
+RUN /qemu.sh riscv64 softmmu
+
+COPY dropbear.sh /
+RUN /dropbear.sh
+
+COPY linux-image.sh /
+RUN /linux-image.sh riscv64
 
 COPY linux-runner /
 

docker/linux-image.sh

@@ -134,6 +134,12 @@ main() {
             kernel="5.*-powerpc64le"
             deps=(libcrypt1:"${arch}")
             ;;
+        riscv64)
+            kernel="5.*-riscv64"
+            debsource="deb http://ftp.ports.debian.org/debian-ports unstable main"
+            debsource="${debsource}\ndeb http://ftp.ports.debian.org/debian-ports unreleased main"
+            deps=(libcrypt1:"${arch}")
+            ;;
         s390x)
             arch=s390x
             kernel="5.*-s390x"

docker/linux-runner

@@ -98,6 +98,9 @@ case "${arch}" in
         opt="-append console=ttyPZ0"
         n=1
         ;;
+    riscv64)
+        opt="-machine virt"
+        ;;
     powerpc64|powerpc64le)
         opt="-append console=hvc0 --nodefaults -serial stdio"
         ;;
@@ -140,12 +143,16 @@ esac
     else
         ${QEMU_CMD} >> "${LOG}" 2>&1 &
     fi
+    qemu_pid=$!
 
     # wait for dropbear
     for _ in $(seq 240); do
         if grep -q "Not backgrounding" "${LOG}"; then
             READY=1
             break
+        elif ! (ps -p "${qemu_pid}" >/dev/null 2>&1); then
+            # qemu command failed and exited early
+            exit 1
         fi
         sleep 0.5s
     done