From fca058bc61ee0ee5b6f9cc9ab8676546137b66a7 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Fri, 18 Mar 2022 01:36:59 +0000
Subject: [PATCH] Correct `--architecture` in `fpm` commands - update `fpm`
 commands to use a supported `--architecture` value - the x64 .rpm files we
 previously produced were incompatible w/ installation on an x64 machine

---
 src/Installers/Rpm/Directory.Build.targets | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets
index 44b87eea5ac5..a3f65b11597e 100644
--- a/src/Installers/Rpm/Directory.Build.targets
+++ b/src/Installers/Rpm/Directory.Build.targets
@@ -50,6 +50,14 @@
       <ChangeLogProps>$(ChangeLogProps);PACKAGE_VERSION=$(PackageVersion)</ChangeLogProps>
       <ChangeLogProps>$(ChangeLogProps);PACKAGE_REVISION=$(PackageRevision)</ChangeLogProps>
 
+      <!--
+        RpmArch is used to match our naming conventions but
+        https://fedoraproject.org/wiki/Architectures#Primary_Architectures lists the canonical names `fpm` and
+        `rpmbuild` expect on the command line. Aliases like ARMv8, arm-64 and amd64 should also work.
+      -->
+      <CommandLineArch Condition=" '$(TargetArchitecture)' == 'x64' ">x86_64</CommandLineArch>
+      <CommandLineArch Condition=" '$(TargetArchitecture)' == 'arm64' ">aarch64</CommandLineArch>
+
       <GeneratedChangeLog>$(IntermediateOutputPath)changelog</GeneratedChangeLog>
     </PropertyGroup>
 
@@ -64,7 +72,7 @@
       <FpmArgs Include="--package=$(TargetPath)" />
       <FpmArgs Include="--version=$(PackageVersion)" />
       <FpmArgs Include="--iteration=$(PackageRevision)" />
-      <FpmArgs Include="--architecture=$(RpmArch)" />
+      <FpmArgs Include="--architecture=$(CommandLineArch)" />
       <FpmArgs Include="--depends=&quot;%(RpmDependency.Identity) &gt;= %(RpmDependency.Version)&quot;" Condition=" '%(RpmDependency.Identity)' != '' "  />
       <FpmArgs Include="--rpm-changelog=&quot;$(GeneratedChangeLog)&quot;" />
       <FpmArgs Include="--rpm-summary=&quot;$(PackageSummary)&quot;" />