Merge pull request #274 from xen0n/loong64

Add cross-build target linux/loong64
estesp · Nov 21, 2024 · 6a11d4e · 6a11d4e
2 parents a834ffe + ad60092
commit 6a11d4e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/hack/cross.sh b/hack/cross.sh
@@ -25,6 +25,9 @@ PLATFORMS=(
   # ARM; 32bit and 64bit
   linux/arm/5 linux/arm/6 linux/arm/7 linux/arm64
 
+  # LoongArch
+  linux/loong64
+
   # MIPS
   linux/mips64le
 

diff --git a/v2/pkg/util/osgen.go b/v2/pkg/util/osgen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // This program generates oslist.go. It can be invoked by running
@@ -10,6 +11,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"sort"
 	"strings"
 	"text/template"
 	"time"
@@ -52,6 +54,11 @@ func main() {
 		i++
 	}
 
+	// Make the output deterministic because iteration order over Go map keys
+	// is random.
+	sort.Strings(oslist)
+	sort.Strings(archlist)
+
 	packageTemplate.Execute(f, struct {
 		Timestamp time.Time
 		OS        []string

diff --git a/v2/pkg/util/oslist.go b/v2/pkg/util/oslist.go