From 3e125443aa5d4c9e4a2bb0b42e2cd8b176a7b5d4 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Wed, 2 Feb 2022 11:48:29 +0000
Subject: [PATCH] build: fix ARM architecture version in .deb packages after
 nfpm change

Fixes #5973
---
 bin/cross-compile.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/bin/cross-compile.go b/bin/cross-compile.go
index d77250b2a..ea86310d5 100644
--- a/bin/cross-compile.go
+++ b/bin/cross-compile.go
@@ -85,6 +85,13 @@ var archFlags = map[string][]string{
 	"arm-v7": {"GOARM=7"},
 }
 
+// Map Go architectures to NFPM architectures
+// Any missing are passed straight through
+var goarchToNfpm = map[string]string{
+	"arm":    "arm6",
+	"arm-v7": "arm7",
+}
+
 // runEnv - run a shell command with env
 func runEnv(args, env []string) error {
 	if *debug {
@@ -167,11 +174,15 @@ func buildDebAndRpm(dir, version, goarch string) []string {
 	pkgVersion := version[1:]
 	pkgVersion = strings.Replace(pkgVersion, "β", "-beta", -1)
 	pkgVersion = strings.Replace(pkgVersion, "-", ".", -1)
+	nfpmArch, ok := goarchToNfpm[goarch]
+	if !ok {
+		nfpmArch = goarch
+	}
 
 	// Make nfpm.yaml from the template
 	substitute("../bin/nfpm.yaml", path.Join(dir, "nfpm.yaml"), map[string]string{
 		"Version": pkgVersion,
-		"Arch":    goarch,
+		"Arch":    nfpmArch,
 	})
 
 	// build them
@@ -377,7 +388,7 @@ func compileArch(version, goos, goarch, dir string) bool {
 			artifacts := []string{buildZip(dir)}
 			// build a .deb and .rpm if appropriate
 			if goos == "linux" {
-				artifacts = append(artifacts, buildDebAndRpm(dir, version, stripVersion(goarch))...)
+				artifacts = append(artifacts, buildDebAndRpm(dir, version, goarch)...)
 			}
 			if *copyAs != "" {
 				for _, artifact := range artifacts {