From e41825cae0ad219dd99082771f35dad4caf3ad62 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 5 Oct 2014 16:08:09 +0200 Subject: reproducible: use epoch free version earlier --- bin/reproducible_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 565c3177..c023b545 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -147,6 +147,8 @@ for SRCPACKAGE in ${PACKAGES} ; do continue else VERSION=$(grep "^Version: " ${SRCPACKAGE}_*.dsc| grep -v "GnuPG v" | sort -r | head -1 | cut -d " " -f2-) + # EPOCH_FREE_VERSION was too long + EVERSION=$(echo $VERSION | cut -d ":" -f2) TMPLOG=$(mktemp) mv ${RBUILDLOG} ${TMPLOG} RBUILDLOG=/var/lib/jenkins/userContent/rbuild/${SRCPACKAGE}_${EVERSION}.rbuild.log @@ -160,8 +162,6 @@ for SRCPACKAGE in ${PACKAGES} ; do continue move_rbuildlog fi - # EPOCH_FREE_VERSION was too long - EVERSION=$(echo $VERSION | cut -d ":" -f2) sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_*.dsc | tee ${SRCPACKAGE}_${EVERSION}.pbuilder.log cat ${SRCPACKAGE}_${EVERSION}.pbuilder.log >> ${RBUILDLOG} if [ -f /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes ] ; then -- cgit v1.2.3-54-g00ecf