[X2Go-Commits] [buildscripts] 01/01: fix srpm retrieval for i386 builds

git-admin at x2go.org git-admin at x2go.org
Mon Oct 13 14:09:38 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 0c50ba7a061177b4d74ee6d1aadbfdeb0f249013
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 13 14:09:36 2014 +0200

    fix srpm retrieval for i386 builds
---
 bin/build-rpm-package |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 88bffe6..01dda79 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -311,14 +311,16 @@ build_packages() {
 							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 at 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
+						ls $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.*.src.rpm | while read srpm; do
+							if nice mock -r ${l_DIST}-${l_CODENAME}-i386  --result $PKGDIST/$l_DIST/$l_CODENAME/i386 "$srpm"; then
+								rpmsign-unattended -D "%_gpg_name debian at 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
+						done
 					fi
 				fi
 			done

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list