From c0ee4a4ff14f96819267cc52020dd17486cade82 Mon Sep 17 00:00:00 2001
From: Hongli Lai <hongli@phusion.nl>
Date: Sun, 13 Oct 2024 08:13:17 +0000
Subject: [PATCH] RPM packaging: separate RPM and Docker architecture, fix
 creating Passenger source tarball

---
 dev/ci/tests/rpm/Jenkinsfile | 17 +++++++++--------
 dev/ci/tests/rpm/run         |  9 ++++++---
 packaging/rpm                |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dev/ci/tests/rpm/Jenkinsfile b/dev/ci/tests/rpm/Jenkinsfile
index c228f699fc..fc243d7bcf 100644
--- a/dev/ci/tests/rpm/Jenkinsfile
+++ b/dev/ci/tests/rpm/Jenkinsfile
@@ -1,10 +1,11 @@
-def setupTest(enablerFlag, distribution, architecture, block) {
+def setupTest(enablerFlag, distribution, rpmArch, dockerArch, block) {
   if (enablerFlag) {
-    node("linux && ${architecture}") {
+    node("linux && ${rpmArch}") {
       withEnv([
-        "CACHE_DIR=${env.JENKINS_HOME}/cache/${env.JOB_NAME}/${distribution}-${architecture}",
+        "CACHE_DIR=${env.JENKINS_HOME}/cache/${env.JOB_NAME}/${distribution}-${rpmArch}",
         "DISTRIBUTION=${distribution}",
-        "ARCHITECTURE=${architecture}"
+        "RPM_ARCH=${rpmArch}",
+        "DOCKER_ARCH=${dockerArch}"
       ], block)
     }
   } else {
@@ -48,25 +49,25 @@ pipeline {
         script {
           parallel(
             'el8 x86_64': {
-              setupTest(params.EL8, 'el8', 'x86_64') {
+              setupTest(params.EL8, 'el8', 'x86_64', 'amd64') {
                 checkout scm
                 sh './dev/ci/tests/rpm/run'
               }
             },
             'el9 x86_64': {
-              setupTest(params.EL9, 'el9', 'x86_64') {
+              setupTest(params.EL9, 'el9', 'x86_64', 'amd64') {
                 checkout scm
                 sh './dev/ci/tests/rpm/run'
               }
             },
             'el8 aarch64': {
-              setupTest(params.EL8, 'el8', 'aarch64') {
+              setupTest(params.EL8, 'el8', 'aarch64', 'arm64') {
                 checkout scm
                 sh './dev/ci/tests/rpm/run'
               }
             },
             'el9 aarch64': {
-              setupTest(params.EL9, 'el9', 'aarch64') {
+              setupTest(params.EL9, 'el9', 'aarch64', 'arm64') {
                 checkout scm
                 sh './dev/ci/tests/rpm/run'
               }
diff --git a/dev/ci/tests/rpm/run b/dev/ci/tests/rpm/run
index b881cdc96a..724d241ab4 100755
--- a/dev/ci/tests/rpm/run
+++ b/dev/ci/tests/rpm/run
@@ -29,7 +29,8 @@ source "./internal/lib/distro_info.sh"
 
 require_envvar WORKSPACE "$WORKSPACE"
 require_envvar DISTRIBUTION "$DISTRIBUTION"
-require_envvar ARCHITECTURE "$ARCHITECTURE"
+require_envvar RPM_ARCH "$RPM_ARCH"
+require_envvar DOCKER_ARCH "$DOCKER_ARCH"
 
 PASSENGER_ROOT="${PASSENGER_ROOT:-$WORKSPACE}"
 CACHE_DIR="${CACHE_DIR:-$WORKSPACE/cache}"
@@ -51,7 +52,8 @@ run ./build \
 	-o "$WORKSPACE/output" \
 	-p "$PASSENGER_ROOT" \
 	-d "$DISTRIBUTION" \
-	-a "$ARCHITECTURE" \
+	-a "$RPM_ARCH" \
+	-A "$DOCKER_ARCH" \
 	-R \
 	rpm:all
 run ./test \
@@ -59,6 +61,7 @@ run ./test \
 	-d "$WORKSPACE/output/$DISTRIBUTION" \
 	-c "$CACHE_DIR" \
 	-x "$TEST_DISTRO_NAME" \
-	-a "$ARCHITECTURE" \
+	-a "$RPM_ARCH" \
+	-A "$DOCKER_ARCH" \
 	-j \
 	$EXTRA_TEST_PARAMS
diff --git a/packaging/rpm b/packaging/rpm
index 0f3f49bd32..76b4d22bc6 160000
--- a/packaging/rpm
+++ b/packaging/rpm
@@ -1 +1 @@
-Subproject commit 0f3f49bd32134f52295e615c2294a45bf4bb817f
+Subproject commit 76b4d22bc690466da2c7205d137fb30136f55fcf