This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from b64e6af another fix new 2e7758a fix build new 63079d6 obs-build for 32-bit architectures added 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 | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) -- Alioth's /srv/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 2e7758a4eb98773121926d7c6a2093a3094d8943 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Oct 11 22:26:33 2014 +0200 fix build --- bin/build-rpm-package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 379523a..b1d3e43 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -238,10 +238,10 @@ build_packages() { --clean \ $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/x86_64/" - find "/var/cache/obs-build/$l_DIST/$l_CODENAME/x86_64/home/abuild/rpmbuild/RPMS/*"| egrep '.*\.rpm$' | while read rpmfile; do - mv "$rpmfile" "$PKGDIST/$l_DIST/$l_CODENAME/x86_64/" + find "/var/cache/obs-build/$l_DIST/$l_CODENAME/x86_64/home/abuild/rpmbuild/RPMS/" -type f | egrep '.*\.rpm$' | while read rpmfile; do + cp "$rpmfile" "$PKGDIST/$l_DIST/$l_CODENAME/x86_64/" done - rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/x86_64/*.rpm + rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign "$PKGDIST/$l_DIST/$l_CODENAME/x86_64/"*.rpm else rm -Rf "$TEMP_DIR" exit -1 -- Alioth's /srv/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 63079d6934bba935f5e6f1cdb355a9130608f47a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Oct 11 22:30:18 2014 +0200 obs-build for 32-bit architectures added --- bin/build-rpm-package | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index b1d3e43..5013093 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -263,18 +263,37 @@ build_packages() { fi fi if [ "x$SKIP_ARCH" != "xi386" ] && [ "$IS_NOARCH" != "yes" ]; then - rm -f $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log - while [ -d ~mock/${l_DIST}-${l_CODENAME}-i386 ]; do - echo "Waiting for some other build to finish..." - sleep 30 - done - if nice mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then - rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/i386/*.rpm - cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log + if [ "x$l_DIST" = "xopensuse" ]; then + OPENSUSE_DOWNLOAD_URL=$(echo "$OPENSUSE_DOWNLOAD_URL" | sed "s/#VERSION#/$l_CODENAME/") + if sudo linux32 obs-build \ + --nosignature \ + --repo "$OPENSUSE_DOWNLOAD_URL" \ + --root "/var/cache/obs-build/$l_DIST/$l_CODENAME/i386/" \ + --clean \ + $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then + mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/i386/" + find "/var/cache/obs-build/$l_DIST/$l_CODENAME/i386/home/abuild/rpmbuild/RPMS/" -type f | egrep '.*\.rpm$' | while read rpmfile; do + cp "$rpmfile" "$PKGDIST/$l_DIST/$l_CODENAME/i386/" + done + rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign "$PKGDIST/$l_DIST/$l_CODENAME/i386/"*.rpm + else + rm -Rf "$TEMP_DIR" + exit -1 + fi else - cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log - rm -Rf "$TEMP_DIR" - exit -1 + while [ -d ~mock/${l_DIST}-${l_CODENAME}-i386 ]; do + echo "Waiting for some other build to finish..." + sleep 30 + done + rm -f $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log + if nice mock -r ${l_DIST}-${l_CODENAME}-i386 --result $PKGDIST/$l_DIST/$l_CODENAME/i386 $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then + rpmsign-unattended -D "%_gpg_name debian@x2go.org" --addsign $PKGDIST/$l_DIST/$l_CODENAME/i386/*.rpm + cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log + else + cat $PKGDIST/$l_DIST/$l_CODENAME/i386/build.log + rm -Rf "$TEMP_DIR" + exit -1 + fi fi fi done -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org