summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-10-13 14:09:36 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-10-13 14:09:36 +0200
commit0c50ba7a061177b4d74ee6d1aadbfdeb0f249013 (patch)
treeb44c597a313bb1e3de0d2cf8c9bae230a55e58ce
parent03871b13adebdfb5b80693c1bbe4453dc3b22aca (diff)
downloadbuildscripts-0c50ba7a061177b4d74ee6d1aadbfdeb0f249013.tar.gz
buildscripts-0c50ba7a061177b4d74ee6d1aadbfdeb0f249013.tar.bz2
buildscripts-0c50ba7a061177b4d74ee6d1aadbfdeb0f249013.zip
fix srpm retrieval for i386 builds
-rwxr-xr-xbin/build-rpm-package18
1 files 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@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@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