From 33869387d184f84836e7f33cde87c2caa9a30211 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Mon, 7 Sep 2020 12:46:11 +0100 Subject: [PATCH] build: fix architecture name in ARMv7 build - fixes #4571 After introducing the arm-v7 build we are accidentally making debs and rpms with the architecture arm-v7. This fixes the problem by stripping the version off. --- bin/cross-compile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cross-compile.go b/bin/cross-compile.go index 4c075afc5..d40f3798b 100644 --- a/bin/cross-compile.go +++ b/bin/cross-compile.go @@ -324,7 +324,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, goarch)...) + artifacts = append(artifacts, buildDebAndRpm(dir, version, stripVersion(goarch))...) } if *copyAs != "" { for _, artifact := range artifacts {