From 7e76ef587a0d05b9f6e107b47268d571f852527c Mon Sep 17 00:00:00 2001 From: Ruoqing He Date: Tue, 21 Jan 2025 18:05:37 +0800 Subject: [PATCH] virtiofsd: Enable build for RISC-V With this change, `virtiofsd` (gnu target) could be built and then to be used with other components. Depends: #10741 Fixes: #10739 Signed-off-by: Ruoqing He --- tools/packaging/scripts/lib.sh | 4 ++++ tools/packaging/static-build/virtiofsd/build.sh | 3 +++ tools/packaging/static-build/virtiofsd/gnu/Dockerfile | 1 + 3 files changed, 8 insertions(+) diff --git a/tools/packaging/scripts/lib.sh b/tools/packaging/scripts/lib.sh index 5d592836d4..f5ba3624b6 100644 --- a/tools/packaging/scripts/lib.sh +++ b/tools/packaging/scripts/lib.sh @@ -67,6 +67,7 @@ arch_to_golang() case "$arch" in aarch64) echo "arm64";; ppc64le) echo "$arch";; + riscv64) echo "$arch";; x86_64) echo "amd64";; s390x) echo "s390x";; *) die "unsupported architecture: $arch";; @@ -200,6 +201,9 @@ get_virtiofsd_image_name() { "ppc64le") libc="gnu" ;; + "riscv64") + libc="gnu" + ;; "s390x") libc="gnu" ;; diff --git a/tools/packaging/static-build/virtiofsd/build.sh b/tools/packaging/static-build/virtiofsd/build.sh index 6d52f7d408..fb8ec00b99 100755 --- a/tools/packaging/static-build/virtiofsd/build.sh +++ b/tools/packaging/static-build/virtiofsd/build.sh @@ -39,6 +39,9 @@ case ${ARCH} in "ppc64le") libc="gnu" ;; + "riscv64") + libc="gnu" + ;; "s390x") libc="gnu" ;; diff --git a/tools/packaging/static-build/virtiofsd/gnu/Dockerfile b/tools/packaging/static-build/virtiofsd/gnu/Dockerfile index 23b9d4feae..73f84826b2 100644 --- a/tools/packaging/static-build/virtiofsd/gnu/Dockerfile +++ b/tools/packaging/static-build/virtiofsd/gnu/Dockerfile @@ -34,6 +34,7 @@ RUN ARCH=$(uname -m); \ case "${ARCH}" in \ "aarch64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ "ppc64le") rust_arch="powerpc64le"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ + "riscv64") rust_arch="riscv64gc"; libc="gnu"; arch_libc=${ARCH}-linux-${libc}; extra_rust_flags="" ;; \ "x86_64") rust_arch="${ARCH}"; libc="musl"; arch_libc="" ;; \ "s390x") rust_arch="${ARCH}"; libc="gnu"; arch_libc=${rust_arch}-linux-${libc}; extra_rust_flags="" ;; \ *) echo "Unsupported architecture: ${ARCH}" && exit 1 ;; \