From 6e851aec00d94aea011ce922e23928902a8c644f Mon Sep 17 00:00:00 2001
From: Cody Shepherd <cody.shepherd@gmail.com>
Date: Thu, 1 Jul 2021 10:24:31 -0700
Subject: [PATCH 1/2] fix: convert arm arch names for rpms during builds via
 docker

---
 releng/packages/fs/usr/local/bin/influxdb_packages.bash | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/releng/packages/fs/usr/local/bin/influxdb_packages.bash b/releng/packages/fs/usr/local/bin/influxdb_packages.bash
index b086ea2be5a..79cc2221f87 100755
--- a/releng/packages/fs/usr/local/bin/influxdb_packages.bash
+++ b/releng/packages/fs/usr/local/bin/influxdb_packages.bash
@@ -113,6 +113,13 @@ elif [ "$OS" == "linux" ] || [ "$OS" == "darwin" ]; then
   if [ "$OS" == "linux" ] ; then
     # Call fpm to build .deb and .rpm packages.
     for typeargs in "-t deb" "-t rpm --depends coreutils --depends shadow-utils"; do
+      ARCH_CONVERTED=$ARCH
+      pkg_t=$(echo $typeargs | cut -d ' ' -f2)
+      if [ "$pkg_t" == "rpm" ] && [ $"$ARCH" == "armhf" ]; then
+        ARCH_CONVERTED="armv7hl"
+      elif [ "$pkg_t" == "rpm" ] && [ $"$ARCH" == "arm64" ]; then
+        ARCH_CONVERTED="aarch64"
+      fi
       FPM_NAME=$(
       fpm \
         -s dir \
@@ -133,7 +140,7 @@ elif [ "$OS" == "linux" ] || [ "$OS" == "darwin" ]; then
         --config-files /etc/influxdb/influxdb.conf \
         --config-files /etc/logrotate.d/influxdb \
         --name "influxdb" \
-        --architecture "$ARCH" \
+        --architecture "$ARCH_CONVERTED" \
         --version "$VERSION" \
         --iteration 1 \
         -C "$PKG_ROOT" \

From cbfb88edc5666fd090f61a5f780b4033f1b1c8b7 Mon Sep 17 00:00:00 2001
From: Cody Shepherd <cody.shepherd@gmail.com>
Date: Thu, 1 Jul 2021 13:29:07 -0700
Subject: [PATCH 2/2] chore: update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 596a915c44a..471b21859a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 v1.8.7 [unreleased]
 -------------------
 
-- [#](https://github.com/influxdata/influxdb/pull/21749): fix: rename arm rpms with yum-compatible names
+- [#21749](https://github.com/influxdata/influxdb/pull/21749): fix: rename arm rpms with yum-compatible names
+- [#21775](https://github.com/influxdata/influxdb/pull/21775): fix: convert arm arch names for rpms during builds via docker
 
 v1.8.6 [2021-05-20]
 -------------------