This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from ea45d18 bin/build-rpm-package: OpenSuSE 13.2 is legacy now as well. new ee16c4f bin/build-rpm-package: don't use ~mock, but hardcode /var/lib/mock. new ac1a56e bin/build-rpm-package: break out early if base arch is unknown. 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 | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 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 ee16c4f1f2b00756f226a0a7ba4952bbd264eb48 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 18 06:14:14 2017 +0200 bin/build-rpm-package: don't use ~mock, but hardcode /var/lib/mock. Typical systems do not have a "mock" user, only a "mock" group. The directory is hardcoded in mock's man page, so it's probably fine to hardcode it as well. --- bin/build-rpm-package | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 06f95b5..ca7cac6 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -892,7 +892,12 @@ build_packages() { # Build SRPM. typeset base_arch="${arches[1]}" if [ "x${l_DIST}" = "xfedora" ] || [ "x${l_DIST}" = "xepel" ]; then - while [ -d ~mock/"${l_DIST}-${l_CODENAME}-${base_arch}" ]; do + # Previously used ~mock here, but don't, since on typical systems + # (no matter whether Debian, CentOS or Fedora), a "mock" user does + # exist - only a "mock" group. + # /var/lib/mock is hardcoded in mock's man page as the chroots + # location, so use the same hardcoded value. + while [ -d "/var/lib/mock/${l_DIST}-${l_CODENAME}-${base_arch}" ]; do echo "Waiting for some other build to finish..." sleep 30 done @@ -985,7 +990,12 @@ build_packages() { exit 1 fi else - while [ -d ~mock/"${l_DIST}-${l_CODENAME}-${l_ARCH}" ]; do + # Previously used ~mock here, but don't, since on typical systems + # (no matter whether Debian, CentOS or Fedora), a "mock" user does + # exist - only a "mock" group. + # /var/lib/mock is hardcoded in mock's man page as the chroots + # location, so use the same hardcoded value. + while [ -d "/var/lib/mock/${l_DIST}-${l_CODENAME}-${l_ARCH}" ]; do echo "Waiting for some other build to finish..." sleep 30 done -- 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 ac1a56e6ef3739e8e4def596d079a4a348fc6205 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 18 06:15:04 2017 +0200 bin/build-rpm-package: break out early if base arch is unknown. --- bin/build-rpm-package | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index ca7cac6..0a100dd 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -891,6 +891,11 @@ build_packages() { if [ "${l_ARCH}" = "SRPM" ]; then # Build SRPM. typeset base_arch="${arches[1]}" + if [ -z "${base_arch}" ]; then + echo "No base arch available, your PLATFORM (${PLATFORM}) value is likely invalid." >&2 + exit 1 + fi + if [ "x${l_DIST}" = "xfedora" ] || [ "x${l_DIST}" = "xepel" ]; then # Previously used ~mock here, but don't, since on typical systems # (no matter whether Debian, CentOS or Fedora), a "mock" user does -- 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