From 2a3f423e1047358d8409d26ecfe02006c94058be Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Tue, 27 Sep 2022 16:49:00 +0300 Subject: [PATCH] Replace armhf with armhfp for RPMs (#55814) --- pkg/build/config/variant.go | 13 +++++++------ pkg/build/grafana/variant.go | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/build/config/variant.go b/pkg/build/config/variant.go index 5214c6c3056..4fde6a89a74 100644 --- a/pkg/build/config/variant.go +++ b/pkg/build/config/variant.go @@ -31,12 +31,13 @@ var AllVariants = []Variant{ type Architecture string const ( - ArchAMD64 Architecture = "amd64" - ArchARMv6 Architecture = "armv6" - ArchARMv7 Architecture = "armv7" - ArchARM64 Architecture = "arm64" - ArchARMHF Architecture = "armhf" - ArchARM Architecture = "arm" + ArchAMD64 Architecture = "amd64" + ArchARMv6 Architecture = "armv6" + ArchARMv7 Architecture = "armv7" + ArchARM64 Architecture = "arm64" + ArchARMHF Architecture = "armhf" + ArchARMHFP Architecture = "armhfp" + ArchARM Architecture = "arm" ) type OS string diff --git a/pkg/build/grafana/variant.go b/pkg/build/grafana/variant.go index e55d0accb48..6ccd4abb8a4 100644 --- a/pkg/build/grafana/variant.go +++ b/pkg/build/grafana/variant.go @@ -81,7 +81,7 @@ var variantArgs = map[config.Variant]BuildArgs{ CC: compilers.Armv7, }, DebArch: config.ArchARMHF, - RPMArch: config.ArchARMHF, + RPMArch: config.ArchARMHFP, }, config.VariantArmV7Musl: { BuildOpts: golangutils.BuildOpts{