From ab65443d8c1e0aae3bdf7c4096a3ae716033a03b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 21 Mar 2024 16:49:39 -0700
Subject: [PATCH] Installer build steps aren't cross builds

---
 eng/pipelines/common/templates/global-build-step.yml  | 3 ++-
 eng/pipelines/installer/steps/build-linux-package.yml | 2 ++
 eng/pipelines/runtime.yml                             | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/common/templates/global-build-step.yml b/eng/pipelines/common/templates/global-build-step.yml
index 6597ac4feaefcd..f732a5e27a4a9c 100644
--- a/eng/pipelines/common/templates/global-build-step.yml
+++ b/eng/pipelines/common/templates/global-build-step.yml
@@ -3,11 +3,12 @@ parameters:
   useContinueOnErrorDuringBuild: false
   shouldContinueOnError: false
   archParameter: $(_archParameter)
+  crossArg: $(crossArg)
   displayName: Build product
   container: ''
 
 steps:
-  - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
+  - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) ${{ parameters.crossArg }} ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
     displayName: ${{ parameters.displayName }}
     ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
       continueOnError: ${{ parameters.shouldContinueOnError }}
diff --git a/eng/pipelines/installer/steps/build-linux-package.yml b/eng/pipelines/installer/steps/build-linux-package.yml
index 57baa4a74fce9a..443c580e189158 100644
--- a/eng/pipelines/installer/steps/build-linux-package.yml
+++ b/eng/pipelines/installer/steps/build-linux-package.yml
@@ -16,6 +16,8 @@ steps:
     buildArgs: -s packs.installers ${{ parameters.packagingArgs }} /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.packageType }}.installers.binlog
     container: ${{ parameters.target }}
     displayName: Package Runtime Deps, Runtime, Framework Packs - ${{ parameters.packageType }} packages
+    # Even for cross-build targets, our installer build steps are not cross-builds
+    crossArg: ''
     condition: ${{ parameters.condition }}
 
 # Broken symbolic links break the SBOM processing
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 2a55c701115e02..b9ebadb10100cc 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -119,6 +119,7 @@ extends:
                   packageType: rpm
                   target: rpmpkg
                   packagingArgs: -c $(_BuildConfig) /p:BuildRpmPackage=true
+                  condition: and(succeeded(), eq(variables.osSubgroup, ''))
             condition: >-
               or(
                 eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true),