This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 73d4c7e bin/slave-start-chroot.sh: add a sync run before chrooting to automatically sync up the other buildscripts directory. new 63902ce bin/build-rpm-package: correctly use l_ARCH variable in build section. new b125b0e bin/debian-codename-to-version.sh: add buster codename. new f631a98 bin/ubuntu-codename-to-version.sh: add artful codename. The 3 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 | 14 +++++++++----- bin/debian-codename-to-version.sh | 3 ++- bin/ubuntu-codename-to-version.sh | 3 ++- 3 files changed, 13 insertions(+), 7 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 b125b0ed307e419dba8bfb93cbc27295f8dec2d9 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 6 06:46:06 2017 +0200 bin/debian-codename-to-version.sh: add buster codename. --- bin/debian-codename-to-version.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/debian-codename-to-version.sh b/bin/debian-codename-to-version.sh index d7b3d38..d92adce 100755 --- a/bin/debian-codename-to-version.sh +++ b/bin/debian-codename-to-version.sh @@ -66,8 +66,9 @@ case "${codename}" in # For now and due to the aforementioned problems, # I decided to not handle the "testing" code name # at all. - ("stretch") echo "9";; + ("buster") echo "10";; + ("stretch") echo "9";; ("jessie") echo "8";; ("wheezy") echo "7";; ("squeeze") echo "6";; -- 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 63902ced2d48124aaf9ee9406335049f38ea182b Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jun 17 21:25:32 2017 +0200 bin/build-rpm-package: correctly use l_ARCH variable in build section. Previously, this variable was initialized to an empty string and kept that way, but used with a different value in mind. This lead to source RPMs accumulating in the wrong directory. --- bin/build-rpm-package | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index e2662c8..29b304c 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -665,7 +665,7 @@ build_packages() { test -z "${CODENAMES}" || grep "${CODENAMES}" <<< "${line}" || break # FIXME: Builds currently break without this. This should really be merged/transformed into an arch loop. - typeset l_ARCH="" + typeset l_ARCH="SRPM" # create rpmbuild subdirectories mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SOURCES" @@ -798,6 +798,8 @@ build_packages() { fi if [ "x${SKIP_ARCH}" != "xx86_64" ] || [ "${IS_NOARCH}" = "yes" ]; then + l_ARCH="x86_64" + if [ "x${l_DIST}" = "xopensuse" ] || [ "x${l_DIST}" = "xsle" ]; then while ps ax | grep -E "build.*/var/cache/obs-build/${l_DIST}/${l_CODENAME}/x86_64/" | grep "sudo obs"; do echo "Waiting for some other build to finish..." @@ -812,7 +814,7 @@ build_packages() { --repo "${DOWNLOAD_URL}" \ --root "/var/cache/obs-build/${l_DIST}/${l_CODENAME}/x86_64/" \ --clean \ - "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SOURCES/${PROJECT}.spec"; then + "${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/rpmbuild/SOURCES/${PROJECT}.spec"; then mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/x86_64/" # -r parameter to read: Backslashes may NOT escape any characters! @@ -850,7 +852,7 @@ build_packages() { # For information on why this weird -print0 | read -r -d '' construction works, # refer to the first instance of this in this script. - find "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SRPMS/" -type 'f' -iname "${PROJECT}-${UPSTREAM_VERSION}-${PKG_SRCRELEASE}.${IS_RELEASE}.git${DATE}.${GITREV}.${COMPONENT}.*.src.rpm" -print0 | while read -r -d '' srpm; do + find "${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/rpmbuild/SRPMS/" -type 'f' -iname "${PROJECT}-${UPSTREAM_VERSION}-${PKG_SRCRELEASE}.${IS_RELEASE}.git${DATE}.${GITREV}.${COMPONENT}.*.src.rpm" -print0 | while read -r -d '' srpm; do if mock ${MOCK_CHROOT_CONFIG} --resultdir="${PKGDIST}/${l_DIST}/${l_CODENAME}/x86_64" "${srpm}"; then # copy and later sign source RPM cp "${srpm}" "${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/" @@ -880,6 +882,8 @@ build_packages() { fi fi if [ "x${SKIP_ARCH}" != "xi386" ]; then + l_ARCH="i386" + if { [ "x${l_DIST}" = "xopensuse" ] || [ "x${l_DIST}" = "xsle" ]; } && [ "${IS_NOARCH}" != "yes" ]; then while ps ax | grep -E "build.*/var/cache/obs-build/${l_DIST}/${l_CODENAME}/i586/" | grep "sudo obs"; do echo "Waiting for some other build to finish..." @@ -895,7 +899,7 @@ build_packages() { --root "/var/cache/obs-build/${l_DIST}/${l_CODENAME}/i586/" \ --arch "i586" \ --clean \ - "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SOURCES/${PROJECT}.spec"; then + "${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/rpmbuild/SOURCES/${PROJECT}.spec"; then mkdir -p -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/i586/" # For information on why this weird -print0 | read -r -d '' construction works, @@ -935,7 +939,7 @@ build_packages() { # For information on why this weird -print0 | read -r -d '' construction works, # refer to the first instance of this in this script. - find "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/rpmbuild/SRPMS/" -type 'f' -iname "${PROJECT}-${UPSTREAM_VERSION}-${PKG_SRCRELEASE}.${IS_RELEASE}.git${DATE}.${GITREV}.${COMPONENT}.*.src.rpm" -print0 | while read -r -d '' srpm; do + find "${PKGDIST}/${l_DIST}/${l_CODENAME}/SRPM/rpmbuild/SRPMS/" -type 'f' -iname "${PROJECT}-${UPSTREAM_VERSION}-${PKG_SRCRELEASE}.${IS_RELEASE}.git${DATE}.${GITREV}.${COMPONENT}.*.src.rpm" -print0 | while read -r -d '' srpm; do if nice mock ${MOCK_CHROOT_CONFIG} --resultdir="${PKGDIST}/${l_DIST}/${l_CODENAME}/i386" "${srpm}"; then # only copy and sign source RPM if necessary SIGN_SRPM="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 f631a9826ab3a979e1d2ac5ad28296947403b820 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Aug 6 06:48:16 2017 +0200 bin/ubuntu-codename-to-version.sh: add artful codename. --- bin/ubuntu-codename-to-version.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/ubuntu-codename-to-version.sh b/bin/ubuntu-codename-to-version.sh index 0a71ba9..e79aec7 100755 --- a/bin/ubuntu-codename-to-version.sh +++ b/bin/ubuntu-codename-to-version.sh @@ -45,8 +45,9 @@ case "${codename}" in # we can't really do better here. ("devel") echo "9999";; - ("zesty") echo "17.04";; + ("artful") echo "17.10";; + ("zesty") echo "17.04";; ("yakkety") echo "16.10";; ("xenial") echo "16.04";; ("wily") echo "15.10";; -- 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