[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm-package: support OpenSuSE Tumbleweed i586 port, architecture was split out.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository buildscripts.

commit 40cad10af526912697a593683fd4a08e6118f3e7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue May 30 18:59:55 2023 +0200

    bin/build-rpm-package: support OpenSuSE Tumbleweed i586 port, architecture was split out.
---
 bin/build-rpm-package | 68 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 3 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index a28d56f..6c38358 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -45,7 +45,7 @@ PACKAGES_WITHOUT_OTHERMIRROR="keyring"
 GNUPGHOME="${HOME}/.gnupg"
 
 OPENSUSE_DOWNLOAD_URL=( "https://download.opensuse.org/distribution/#LEAP##VERSION#/repo/oss/#SUSESUBDIR#/" "https://download.opensuse.org/update/#LEAP##VERSION#/oss/" )
-OPENSUSE_DOWNLOAD_TUMBLEWEED_URL=( "https://download.opensuse.org/tumbleweed/repo/oss/#SUSESUBDIR#/" )
+OPENSUSE_DOWNLOAD_TUMBLEWEED_URL=( 'https://download.opensuse.org/tumbleweed/repo/oss/#SUSESUBDIR#/' 'http://download.opensuse.org/ports/i586/tumbleweed/repo/oss/' )
 OPENSUSE_DOWNLOAD_ARCHIVE_URL=( "https://ftp.gwdg.de/pub/opensuse/discontinued/distribution/#LEAP##VERSION#/repo/oss/#SUSESUBDIR#/" "https://ftp.gwdg.de/pub/opensuse/discontinued/update/#LEAP##VERSION#/oss/" )
 SLE_DOWNLOAD_URL=( "/srv/mirrors/non-public/sle/#VERSION#/rpms/" )
 
@@ -1208,12 +1208,37 @@ build_packages() {
 								sleep 30
 							done
 
+							# Tumbleweed moved i586 packages into a proper port.
+							# For source RPMs, we can just drop this part.
+							typeset -a tmp_download_urls
+							tmp_download_urls=( "${download_urls[@]}" )
+							if [[ '9999' == "${tmp_suse_major_version}" ]]; then
+								typeset -a tmp_download_url
+								tmp_download_url=( )
+								tmp_download_urls=( )
+								for ((i = 0; i < ${#download_url[@]}; ++i)) do
+									case "${download_url[i]}" in
+										(*'i586'*)
+											# skip
+											;;
+										(*)
+											tmp_download_url+=( "${download_url[i]}" )
+											;;
+									esac
+								done
+
+								typeset url=''
+								for url in "${tmp_download_url[@]}"; do
+									tmp_download_urls+=( '--repo' "${url}" )
+								done
+							fi
+
 							# Obtain packages from our RPM repository.
 							get_extra_repository "suse" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "${base_arch}" "${RPM_WANT_EXTRA_REPOS}"
 							if sudo obs-build \
 							             --nosignature \
 							             ${OTHERMIRROR} \
-							             "${download_urls[@]}" \
+							             "${tmp_download_urls[@]}" \
 							             --root "/var/cache/obs-build/${l_DIST}/${l_CODENAME}/${base_arch}/" \
 							             --clean \
 							             --stage="-bs" \
@@ -1243,6 +1268,43 @@ build_packages() {
 								# Rename the i386 arch to i586 for OpenSuSE and SLE{S,D}.
 								[[ "${l_ARCH}" == "i386" ]] && l_ARCH="i586"
 
+								# Tumbleweed moved i586 packages into a proper port.
+								# Depending on what arch we want to build on, we must either weed out
+								# one or the other.
+								typeset -a tmp_download_urls
+								tmp_download_urls=( "${download_urls[@]}" )
+								if [[ '9999' == "${tmp_suse_major_version}" ]]; then
+									typeset -a tmp_download_url
+									tmp_download_url=( )
+									tmp_download_urls=( )
+									for ((i = 0; i < ${#download_url[@]}; ++i)) do
+										if [[ 'i586' == "${l_ARCH}" ]]; then
+											case "${download_url[i]}" in
+												(*'i586'*)
+													tmp_download_url+=( "${download_url[i]}" )
+													;;
+												(*)
+													# skip
+													;;
+											esac
+										else
+											case "${download_url[i]}" in
+												(*'i586'*)
+													# skip
+													;;
+												(*)
+													tmp_download_url+=( "${download_url[i]}" )
+													;;
+											esac
+										fi
+									done
+
+									typeset url=''
+									for url in "${tmp_download_url[@]}"; do
+										tmp_download_urls+=( '--repo' "${url}" )
+									done
+								fi
+
 								while ps ax | grep -E "build.*/var/cache/obs-build/${l_DIST}/${l_CODENAME}/${l_ARCH}/" | grep "sudo obs"; do
 									echo "Waiting for some other build to finish..."
 									sleep 30
@@ -1258,7 +1320,7 @@ build_packages() {
 								if "${obs_command[@]}" \
 								             --nosignature \
 								             ${OTHERMIRROR} \
-								             "${download_urls[@]}" \
+								             "${tmp_download_urls[@]}" \
 								             --root "/var/cache/obs-build/${l_DIST}/${l_CODENAME}/${l_ARCH}/" \
 								             --arch "${l_ARCH}" \
 								             --clean \

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git