[cpp-linbuild] 03/03: SSPCPP-1015 Generate arch-agnostic repo metadata

[John W. O'Brien]

This is an automated email from the git hooks/post-receive script.

obrienjw pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=7f98f2a6ba28c3653a00420c4402c57f57f5188d

commit 7f98f2a6ba28c3653a00420c4402c57f57f5188d
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Sep 5 14:34:37 2025 +0000

    SSPCPP-1015 Generate arch-agnostic repo metadata
---
 common/build.sh                     | 9 ++++++++-
 os/amazonlinux2/image/local.repo    | 2 +-
 os/amazonlinux2023/image/local.repo | 2 +-
 os/centos7/image/local.repo         | 2 +-
 os/centos8/image/local.repo         | 2 +-
 os/rhel10/image/local.repo          | 2 +-
 os/rhel7/image/local.repo           | 2 +-
 os/rhel8/image/local.repo           | 2 +-
 os/rhel9/image/local.repo           | 2 +-
 os/rockylinux10/image/local.repo    | 2 +-
 os/rockylinux8/image/local.repo     | 2 +-
 os/rockylinux9/image/local.repo     | 2 +-
 12 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/common/build.sh b/common/build.sh
index 1823abf..4744dbe 100644
--- a/common/build.sh
+++ b/common/build.sh
@@ -15,7 +15,14 @@ else
     arch=$machine_arch
 fi
 
-localrepo=${EXT_BASE}/out/RPMS/${arch}
+localrepo=${EXT_BASE}/out/RPMS
+
+for md in $(find ${localrepo} -mindepth 2 -type d -name repodata); do
+    echo "WARNING: Migrating repo metadata to arch-agnostic: ${md}"
+    rm -fr "${md}"
+done
+
+# XXX Multiple simultaneous builders may collide on createrepo
 
 if [ ! -e ${localrepo}/repodata/repomd.xml ]; then
     # Initialize empty local RPM repository
diff --git a/os/amazonlinux2/image/local.repo b/os/amazonlinux2/image/local.repo
index abe1732..685ec84 100644
--- a/os/amazonlinux2/image/local.repo
+++ b/os/amazonlinux2/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/amazonlinux2023/image/local.repo b/os/amazonlinux2023/image/local.repo
index abe1732..685ec84 100644
--- a/os/amazonlinux2023/image/local.repo
+++ b/os/amazonlinux2023/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/centos7/image/local.repo b/os/centos7/image/local.repo
index abe1732..685ec84 100644
--- a/os/centos7/image/local.repo
+++ b/os/centos7/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/centos8/image/local.repo b/os/centos8/image/local.repo
index abe1732..685ec84 100644
--- a/os/centos8/image/local.repo
+++ b/os/centos8/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/rhel10/image/local.repo b/os/rhel10/image/local.repo
index abe1732..685ec84 100644
--- a/os/rhel10/image/local.repo
+++ b/os/rhel10/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/rhel7/image/local.repo b/os/rhel7/image/local.repo
index abe1732..685ec84 100644
--- a/os/rhel7/image/local.repo
+++ b/os/rhel7/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/rhel8/image/local.repo b/os/rhel8/image/local.repo
index abe1732..685ec84 100644
--- a/os/rhel8/image/local.repo
+++ b/os/rhel8/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/rhel9/image/local.repo b/os/rhel9/image/local.repo
index abe1732..685ec84 100644
--- a/os/rhel9/image/local.repo
+++ b/os/rhel9/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/rockylinux10/image/local.repo b/os/rockylinux10/image/local.repo
index abe1732..685ec84 100644
--- a/os/rockylinux10/image/local.repo
+++ b/os/rockylinux10/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/rockylinux8/image/local.repo b/os/rockylinux8/image/local.repo
index abe1732..685ec84 100644
--- a/os/rockylinux8/image/local.repo
+++ b/os/rockylinux8/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0
diff --git a/os/rockylinux9/image/local.repo b/os/rockylinux9/image/local.repo
index abe1732..685ec84 100644
--- a/os/rockylinux9/image/local.repo
+++ b/os/rockylinux9/image/local.repo
@@ -1,5 +1,5 @@
 [local]
 name=Local Shibboleth-SP Build Repo
-baseurl=file:///opt/build/external/out/RPMS/$basearch/
+baseurl=file:///opt/build/external/out/RPMS/
 gpgcheck=0
 enabled=0

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.