From 7bebff5b0f77e69b49fd04fd5ffd52f4bcf72241 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Sat, 5 Mar 2022 13:53:23 -0800
Subject: [PATCH] Avoid duplicate targeting-pack RPM Build - if an RPM
containing platform-neutral executables is platform-neutral, this should be
enough
---
src/Installers/Rpm/Directory.Build.targets | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets
index 80376f60cd1..00c848221ff 100644
--- a/src/Installers/Rpm/Directory.Build.targets
+++ b/src/Installers/Rpm/Directory.Build.targets
@@ -33,7 +33,12 @@
</RpmBuildDependsOn>
</PropertyGroup>
- <Target Name="Build" DependsOnTargets="RpmBuild" />
+ <!-- Do not build platform-neutral targeting-pack RPM in arm64 build. -->
+ <Target Name="Build"
+ Condition=" '$(MSBuildProjectName)' == 'Rpm.TargetingPack' AND '$(TargetRuntimeIdentifier)' == 'linux-arm64' "/>
+ <Target Name="Build"
+ Condition=" !('$(MSBuildProjectName)' == 'Rpm.TargetingPack' AND '$(TargetRuntimeIdentifier)' == 'linux-arm64') "
+ DependsOnTargets="RpmBuild"/>
<Target Name="Pack" />
<Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)">
@@ -41,7 +46,7 @@
<CblMariner1TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner1VersionSuffix)$(CblMarinerExtension)</CblMariner1TargetPath>
<CblMariner2TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner2VersionSuffix)$(CblMarinerExtension)</CblMariner2TargetPath>
</PropertyGroup>
-
+
<!-- Create layout: Create changelog -->
<PropertyGroup>
<ChangeLogProps>DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))</ChangeLogProps>
--
GitLab