From c1ba0bf1608444a39cc5733773b74d7c0330ff15 Mon Sep 17 00:00:00 2001
From: Avi Deitcher <avi@deitcher.net>
Date: Wed, 8 Jan 2025 10:15:32 +0200
Subject: [PATCH] include riscv64 in target architectures

Signed-off-by: Avi Deitcher <avi@deitcher.net>
---
 src/cmd/linuxkit/cache/push.go    | 2 +-
 src/cmd/linuxkit/pkglib/pkglib.go | 2 +-
 src/cmd/linuxkit/run_qemu.go      | 4 ++++
 src/cmd/linuxkit/util/arch.go     | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/cmd/linuxkit/cache/push.go b/src/cmd/linuxkit/cache/push.go
index 964e92981..31a2632cd 100644
--- a/src/cmd/linuxkit/cache/push.go
+++ b/src/cmd/linuxkit/cache/push.go
@@ -17,7 +17,7 @@ import (
 // If remoteName is empty, it is the same as name.
 // If withArchSpecificTags is true, it will push all arch-specific images in the index, each as
 // their own tag with the same name as the index, but with the architecture appended, e.g.
-// image:foo will have image:foo-amd64, image:foo-arm64, etc.
+// image:foo will have image:foo-amd64, image:foo-arm64, image:foo-riscv64, etc.
 func (p *Provider) Push(name, remoteName string, withArchSpecificTags, override bool) error {
 	var (
 		err     error
diff --git a/src/cmd/linuxkit/pkglib/pkglib.go b/src/cmd/linuxkit/pkglib/pkglib.go
index 4e0bf88dd..ca751f077 100644
--- a/src/cmd/linuxkit/pkglib/pkglib.go
+++ b/src/cmd/linuxkit/pkglib/pkglib.go
@@ -60,7 +60,7 @@ type PkglibConfig struct {
 func NewPkgInfo() pkgInfo {
 	return pkgInfo{
 		Org:          "linuxkit",
-		Arches:       []string{"amd64", "arm64"},
+		Arches:       []string{"amd64", "arm64", "riscv64"},
 		Tag:          "{{.Hash}}",
 		GitRepo:      "https://github.com/linuxkit/linuxkit",
 		Network:      false,
diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go
index 7a7066264..2474eec3b 100644
--- a/src/cmd/linuxkit/run_qemu.go
+++ b/src/cmd/linuxkit/run_qemu.go
@@ -70,6 +70,8 @@ func init() {
 		defaultArch = "x86_64"
 	case "s390x":
 		defaultArch = "s390x"
+	case "riscv64":
+		defaultArch = "riscv64"
 	}
 	switch {
 	case runtime.GOARCH == "s390x":
@@ -475,6 +477,8 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
 		goArch = "arm64"
 	case "x86_64":
 		goArch = "amd64"
+	case "riscv64":
+		goArch = "riscv64"
 	default:
 		log.Fatalf("%s is an unsupported architecture.", config.Arch)
 	}
diff --git a/src/cmd/linuxkit/util/arch.go b/src/cmd/linuxkit/util/arch.go
index 747e65097..0e44ad215 100644
--- a/src/cmd/linuxkit/util/arch.go
+++ b/src/cmd/linuxkit/util/arch.go
@@ -20,6 +20,8 @@ func GoArch(in string) (string, error) {
 		return "amd64", nil
 	case "aarch64", "arm64":
 		return "arm64", nil
+	case "riscv64":
+		return "riscv64", nil
 	}
 	return "", fmt.Errorf("unknown arch %q", in)
 }