diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2015-04-06 01:29:47 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-04-18 17:20:08 +0200 |
| commit | a5ead45478ec7ba4a5a75581d62f60d98b953fc5 (patch) | |
| tree | 34b22844eb405dbc30f4335a7bd7381c35d14a18 | |
| parent | 996e208b0ff9e29d7059b27cc8f67ee7dc775a5c (diff) | |
| download | jenkins.debian.net-a5ead45478ec7ba4a5a75581d62f60d98b953fc5.tar.xz | |
reproducible: build: refactor: more comments
| -rwxr-xr-x | bin/reproducible_build.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 9963a6ed..94c66b29 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -249,6 +249,7 @@ check_suitability() { build_rebuild() { local FTBFS=1 local TMPLOG=$(mktemp --tmpdir=$PWD) + local RBUILDLOG=$(mktemp --tmpdir=$PWD) # FIXME check wheter my changes here are fine local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$PWD) local NUM_CPU=$(cat /proc/cpuinfo |grep ^processor|wc -l) mkdir b1 b2 @@ -293,7 +294,7 @@ build_rebuild() { if [ -f b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then # both builds were fine, i.e., they did not FTBFS. local FTBFS=0 - cleanup_userContent # FIXME check wheter my changes were fine + cleanup_userContent # FIXME check wheter my changes here are fine mv $RBUILDLOG /var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log RBUIlDLOG=/var/lib/jenkins/userContent/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_${EVERSION}.rbuild.log call_debbindiff @@ -308,16 +309,19 @@ build_rebuild() { } -TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results -d) +# +# below there is what controls the world +# + +TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results -d) # where everything actually happens trap cleanup_all INT TERM EXIT cd $TMPDIR DATE=$(date +'%Y-%m-%d %H:%M') START=$(date +'%s') -choose_package +choose_package # defines SUITE, PKGID, SRCPACKAGE, SCHEDULED_DATE, SAVE_ARTIFACTS -RBUILDLOG=$(mktemp --tmpdir=$PWD) # FIXME DBDREPORT=$(echo ${SRCPACKAGE}_${EVERSION}.debbindiff.html) BUILDINFO=${SRCPACKAGE}_${EVERSION}_${ARCH}.buildinfo @@ -330,7 +334,7 @@ EVERSION=$(echo $VERSION | cut -d ":" -f2) # EPOCH_FREE_VERSION was too long cat ${SRCPACKAGE}_${EVERSION}.dsc | tee -a ${RBUILDLOG} check_suitability -build_rebuild +build_rebuild # defines RBUILDLOG cd .. cleanup_all |