summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-02-27 18:01:58 +0100
committerHolger Levsen <holger@layer-acht.org>2015-02-27 18:01:58 +0100
commited9c15d8bb30536e06a37448310f4db474d1a2eb (patch)
tree23dadcd97370e268df8aa3f4a351d68f7274508a
parent21aeebc8bc0456f7692f710bf65ea2b44e298193 (diff)
downloadjenkins.debian.net-ed9c15d8bb30536e06a37448310f4db474d1a2eb.tar.xz
Revert "(temp.) Revert "reproducible: use new pbuilder base.tgz's""
This reverts commit 1891874d1866a9831de50f6e313de66f54fa47cc.
-rwxr-xr-xbin/reproducible_build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 91d0da77..19c18158 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -205,7 +205,7 @@ else
( timeout 12h nice ionice -c 3 sudo \
DEB_BUILD_OPTIONS="parallel=$NUM_CPU" \
TZ="/usr/share/zoneinfo/Etc/GMT+12" \
- pbuilder --build --configfile $TMPCFG --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution ${SUITE} ${SRCPACKAGE}_*.dsc
+ pbuilder --build --configfile $TMPCFG --debbuildopts "-b" --basetgz /var/cache/pbuilder/$SUITE-reproducible-base.tgz --distribution ${SUITE} ${SRCPACKAGE}_*.dsc
) 2>&1 | tee ${TMPLOG}
set +x
if [ -f /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes ] ; then
@@ -226,7 +226,7 @@ else
LANG="fr_CH.UTF-8" \
LC_ALL="fr_CH.UTF-8" \
unshare --uts -- /usr/sbin/pbuilder --build --configfile $TMPCFG --hookdir /etc/pbuilder/rebuild-hooks \
- --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution ${SUITE} ${SRCPACKAGE}_${EVERSION}.dsc
+ --debbuildopts "-b" --basetgz /var/cache/pbuilder/$SUITE-reproducible-base.tgz --distribution ${SUITE} ${SRCPACKAGE}_${EVERSION}.dsc
) 2>&1 | tee -a ${RBUILDLOG}
set +x
if [ -f /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes ] ; then