This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 044501a bin/build-rpm-package: explicitly set path for createsusetagsrepo. new 090a363 bin/build-rpm-package: pass createrepo options without wrapping them in quotes. new cb33618 bin/build-rpm-package: only run createsusetagsrepo once for all architectures at the end of the upload run. The 2 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 | 107 ++++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 51 deletions(-) -- Alioth's /srv/git/code.x2go.org/buildscripts.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 cb33618c2df85e0f3e459dee48844dccb609a747 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 25 08:57:43 2016 +0100 bin/build-rpm-package: only run createsusetagsrepo once for all architectures at the end of the upload run. --- bin/build-rpm-package | 105 ++++++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 92986ac..671bcc9 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -976,56 +976,6 @@ upload_packages() { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" scp *.rpm "${REPOS_SERVER}:'${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/${l_ARCH}/${PROJECT}/'" || true - typeset distro_string="" - if [ "${l_DIST}" = "opensuse" ]; then - distro_string="OpenSuSE:" - - typeset -i tmp_suse_major_version="0" - tmp_suse_major_version="$(sed -e 's/\([0-9]*\).*/\1/' <<< "${l_CODENAME}")" - - if [ "x${tmp_suse_major_version}" = "x0" ]; then - echo "Unable to extract SUSE version." - exit 1 - fi - - [ "${tmp_suse_major_version}" -gt "13" ] && distro_string="${distro_string}Leap:" - distro_string="${distro_string}${l_CODENAME}" - else - distro_string="SLE:" - - # Split up version in major version and service pack. - typeset -i major="0" - typeset -i sp="0" - typeset -i i="0" - typeset other="" - typeset -a read_arr - while IFS='.' read -ra read_arr; do - for i in "${read_arr[@]}"; do - if [ "${i}" = "0" ]; then - major="${read_arr[${i}]}" - - [ "${major}" != "${read_arr[${i}]}" ] && { - echo "Major SUSE version is not a valid integer, aborting." >&2 - exit 1 - } - elif [ "${i}" = "1" ]; then - sp="${read_arr[${i}]}" - - [ "${sp}" != "${read_arr[${i}]}" ] && { - echo "SUSE service pack version is not a valid integer, aborting." >&2 - exit 1 - } - else - other="${other}.${read_arr[${i}]}" - fi - done - done <<< "${l_CODENAME}" - - distro_string="${distro_string}${major}" - [ "${sp}" -gt "0" ] && distro_string="${distro_string}:SP${sp}" - [ -n "${other}" ] && distro_string="${distro_string}${other}" - fi - 0</dev/null ssh "${REPOS_SERVER}" "cd '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/' && ~/bin/createsusetagsrepo '.' '${distro_string}' '${l_CODENAME}'" else # create remote directories in archive 0</dev/null ssh "${REPOS_SERVER}" "mkdir -p -- '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/${l_ARCH}/rpms/${PROJECT}'" @@ -1051,6 +1001,61 @@ upload_packages() { fi fi done + + # For *SUSE, we only need to run the repo generation once, since all architectures are part of one repository. + if [ "${l_DIST}" = "opensuse" ] || [ "${l_DIST}" = "sle" ]; then + typeset distro_string="" + if [ "${l_DIST}" = "opensuse" ]; then + distro_string="OpenSuSE:" + + typeset -i tmp_suse_major_version="0" + tmp_suse_major_version="$(sed -e 's/\([0-9]*\).*/\1/' <<< "${l_CODENAME}")" + + if [ "x${tmp_suse_major_version}" = "x0" ]; then + echo "Unable to extract SUSE version." + exit 1 + fi + + [ "${tmp_suse_major_version}" -gt "13" ] && distro_string="${distro_string}Leap:" + distro_string="${distro_string}${l_CODENAME}" + else + distro_string="SLE:" + + # Split up version in major version and service pack. + typeset -i major="0" + typeset -i sp="0" + typeset -i i="0" + typeset other="" + typeset -a read_arr + while IFS='.' read -ra read_arr; do + for i in "${read_arr[@]}"; do + if [ "${i}" = "0" ]; then + major="${read_arr[${i}]}" + + [ "${major}" != "${read_arr[${i}]}" ] && { + echo "Major SUSE version is not a valid integer, aborting." >&2 + exit 1 + } + elif [ "${i}" = "1" ]; then + sp="${read_arr[${i}]}" + + [ "${sp}" != "${read_arr[${i}]}" ] && { + echo "SUSE service pack version is not a valid integer, aborting." >&2 + exit 1 + } + else + other="${other}.${read_arr[${i}]}" + fi + done + done <<< "${l_CODENAME}" + + distro_string="${distro_string}${major}" + [ "${sp}" -gt "0" ] && distro_string="${distro_string}:SP${sp}" + [ -n "${other}" ] && distro_string="${distro_string}${other}" + fi + + 0</dev/null ssh "${REPOS_SERVER}" "cd '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/' && ~/bin/createsusetagsrepo '.' '${distro_string}' '${l_CODENAME}'" + fi done done return 0 -- Alioth's /srv/git/code.x2go.org/buildscripts.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 090a363e1aaa3cc3c0402cf6101d8ed56548055e Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 25 08:57:17 2016 +0100 bin/build-rpm-package: pass createrepo options without wrapping them in quotes. --- bin/build-rpm-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 3b76675..92986ac 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -1044,7 +1044,7 @@ upload_packages() { createrepo_opts="-s sha" gpg_sign_with="${GPG_KEY_EPEL5}" fi - 0</dev/null ssh "${REPOS_SERVER}" "cd '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/${l_ARCH}/' && createrepo '${createrepo_opts}' '.'" + 0</dev/null ssh "${REPOS_SERVER}" "cd '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/${l_ARCH}/' && createrepo ${createrepo_opts} '.'" 0</dev/null ssh "${REPOS_SERVER}" "cd '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/${l_ARCH}/repodata' && rm -f -- 'repomd.xml.asc' && gpg -a -u '${gpg_sign_with}' --detach-sign 'repomd.xml'" 1>/dev/null 2>/dev/null 0</dev/null ssh "${REPOS_SERVER}" "cd '${RPM_REPOS_BASE}/${l_DIST}/${l_CODENAME}/${COMPONENT}/${l_ARCH}/repodata' && test -e 'repomd.xml.key' || gpg -a --output 'repomd.xml.key' --export '${gpg_sign_with}'" -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org