This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from be6c17e bin/build-rpm-package: fix up suse subdir removal/replacement. new dd3aac4 bin/build-rpm-package: support multiple URLs for SuSE, add updates repository. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/build-rpm-package | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit dd3aac4ff7eafec60f7a00416ebb7c29ecec3f4e Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 2 03:36:06 2018 +0200 bin/build-rpm-package: support multiple URLs for SuSE, add updates repository. --- bin/build-rpm-package | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 2200548..d3fba78 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -44,10 +44,10 @@ REPOS_SERVER="packages.mydomain.org" PACKAGES_WITHOUT_OTHERMIRROR="keyring" GNUPGHOME="${HOME}/.gnupg" -OPENSUSE_DOWNLOAD_URL="https://download.opensuse.org/distribution/#LEAP##VERSION#/repo/oss/#SUSESUB..." -OPENSUSE_DOWNLOAD_TUMBLEWEED_URL="https://download.opensuse.org/tumbleweed/repo/oss/#SUSESUBDIR#/" -OPENSUSE_DOWNLOAD_ARCHIVE_URL="https://ftp.gwdg.de/pub/opensuse/discontinued/distribution/#LEAP##VERSION#/r..." -SLE_DOWNLOAD_URL="/srv/mirrors/non-public/sle/#VERSION#/rpms/" +OPENSUSE_DOWNLOAD_URL=( "https://download.opensuse.org/distribution/#LEAP##VERSION#/repo/oss/#SUSESUB..." "https://download.opensuse.org/update/#LEAP##VERSION#/oss/" ) +OPENSUSE_DOWNLOAD_TUMBLEWEED_URL=( "https://download.opensuse.org/tumbleweed/repo/oss/#SUSESUBDIR#/" ) +OPENSUSE_DOWNLOAD_ARCHIVE_URL=( "https://ftp.gwdg.de/pub/opensuse/discontinued/distribution/#LEAP##VERSION#/r..." "https://ftp.gwdg.de/pub/opensuse/discontinued/update/#LEAP##VERSION#/oss/" ) +SLE_DOWNLOAD_URL=( "/srv/mirrors/non-public/sle/#VERSION#/rpms/" ) test -z "${1}" && { exec >&2 @@ -955,6 +955,8 @@ build_packages() { # Only used if necessary, currently for OpenSuSE Tumbleweed only. typeset obs_config_dir="obs-config" + typeset -a download_urls=( ) + typeset -a download_url=( ) typeset -a extra_obs_build_args=( ) typeset obs_build_vendor_tag='' @@ -1006,28 +1008,38 @@ build_packages() { fi if [ "${legacy_release}" -eq "1" ]; then - DOWNLOAD_URL="${OPENSUSE_DOWNLOAD_ARCHIVE_URL}" + download_url="${OPENSUSE_DOWNLOAD_ARCHIVE_URL}" else if [[ "${tmp_suse_major_version}" = "9999" ]]; then - DOWNLOAD_URL="${OPENSUSE_DOWNLOAD_TUMBLEWEED_URL}" + download_url="${OPENSUSE_DOWNLOAD_TUMBLEWEED_URL}" else - DOWNLOAD_URL="${OPENSUSE_DOWNLOAD_URL}" + download_url="${OPENSUSE_DOWNLOAD_URL}" fi fi - DOWNLOAD_URL="$(sed -e "s/#VERSION#/${l_CODENAME}/" <<< "${DOWNLOAD_URL}")" + for ((i = 0; i < ${#download_url[@]}; ++i)) do + download_url[i]="$(sed -e "s/#VERSION#/${l_CODENAME}/g" <<< "${download_url[i]}")" + done if [[ "${tmp_suse_major_version}" -lt "15" ]]; then - DOWNLOAD_URL="$(sed -e 's_#SUSESUBDIR#_suse_' <<< "${DOWNLOAD_URL}")" + for ((i = 0; i < ${#download_url[@]}; ++i)) do + download_url[i]="$(sed -e 's_#SUSESUBDIR#_suse_g' <<< "${download_url[i]}")" + done else - DOWNLOAD_URL="$(sed -e 's_#SUSESUBDIR#__' <<< "${DOWNLOAD_URL}")" + for ((i = 0; i < ${#download_url[@]}; ++i)) do + download_url[i]="$(sed -e 's_#SUSESUBDIR#__g' <<< "${download_url[i]}")" + done fi if [[ "${tmp_suse_major_version}" != "9999" ]]; then if [ "${tmp_suse_major_version}" -gt "13" ]; then - DOWNLOAD_URL="$(sed -e 's_#LEAP#_leap/_' <<< "${DOWNLOAD_URL}")" + for ((i = 0; i < ${#download_url[@]}; ++i)) do + download_url[i]="$(sed -e 's_#LEAP#_leap/_g' <<< "${download_url[i]}")" + done else - DOWNLOAD_URL="$(sed -e 's_#LEAP#__' <<< "${DOWNLOAD_URL}")" + for ((i = 0; i < ${#download_url[@]}; ++i)) do + download_url[i]="$(sed -e 's_#LEAP#__g' <<< "${download_url[i]}")" + done fi else if ! setup_opensuse_tumbleweed_config "${TEMP_DIR}" "${obs_config_dir}"; then @@ -1038,11 +1050,17 @@ build_packages() { extra_obs_build_args+=( "--configdir" "${TEMP_DIR}/${obs_config_dir}" ) fi elif [ "x${l_DIST}" = "xsle" ]; then - DOWNLOAD_URL="$(sed "s/#VERSION#/${l_CODENAME}/" <<< "${SLE_DOWNLOAD_URL}")" + for ((i = 0; i < ${#sle_download_url[@]}; ++i)) do + download_url[i]="$(sed "s/#VERSION#/${l_CODENAME}/g" <<< "${sle_download_url[i]}")" + done if [ "${tmp_suse_major_version}" -lt "12" ]; then BUILD_RESULT="/usr/src/packages" fi fi + + for url in "${download_url[@]}"; do + download_urls+=( '--repo' "${url}" ) + done else typeset arch="" for arch in "${arches[@]}"; do @@ -1098,7 +1116,7 @@ build_packages() { if sudo obs-build \ --nosignature \ ${OTHERMIRROR} \ - --repo "${DOWNLOAD_URL}" \ + "${download_urls[@]}" \ --root "/var/cache/obs-build/${l_DIST}/${l_CODENAME}/${base_arch}/" \ --clean \ --stage="-bs" \ @@ -1143,7 +1161,7 @@ build_packages() { if "${obs_command[@]}" \ --nosignature \ ${OTHERMIRROR} \ - --repo "${DOWNLOAD_URL}" \ + "${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
-
git-admin＠x2go.org