[Reproducible-commits] [misc] 01/01: prebuilder: move some config to the pbuilderrc.rebuild + not set LC_ALL and LANG for the first build

[Mattia Rizzolo]

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

mapreri-guest pushed a commit to branch master
in repository misc.

commit 47032090cd608165884f4c565791bd38bd4401f9
Author: Mattia Rizzolo <mattia at mapreri.org>
Date:   Sat Jul 11 12:55:01 2015 +0000

    prebuilder: move some config to the pbuilderrc.rebuild + not set LC_ALL and LANG for the first build
---
 prebuilder/pbuilderrc.rebuild |  6 ++++++
 prebuilder/rebuild.sh         | 18 ++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/prebuilder/pbuilderrc.rebuild b/prebuilder/pbuilderrc.rebuild
index 032f1e5..aecca52 100644
--- a/prebuilder/pbuilderrc.rebuild
+++ b/prebuilder/pbuilderrc.rebuild
@@ -1 +1,7 @@
 umask 0002
+
+BUILDUSERID=2222
+BUILDUSERNAME=pbuilder2
+export TZ="/usr/share/zoneinfo/Etc/GMT-14"
+export LANG="fr_CH.UTF-8"
+export LC_ALL="fr_CH.UTF-8"
diff --git a/prebuilder/rebuild.sh b/prebuilder/rebuild.sh
index 1cf92d5..0e336e7 100755
--- a/prebuilder/rebuild.sh
+++ b/prebuilder/rebuild.sh
@@ -30,8 +30,11 @@ mkdir -p b1 b2 logs
 sudo \
  DEB_BUILD_OPTIONS="nocheck" \
  TZ="/usr/share/zoneinfo/Etc/GMT+12" \
- LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" \
- unshare --uts -- $BUILDER --build $BUILDER_OPTS --debbuildopts '-b' --buildresult b1 --logfile logs/${PACKAGE}.build1 ${PACKAGE}_*.dsc
+ unshare --uts -- $BUILDER --build $BUILDER_OPTS \
+    --debbuildopts '-b' \
+    --buildresult b1 \
+    --logfile logs/${PACKAGE}.build1 \
+    ${PACKAGE}_*.dsc
 xz < logs/${PACKAGE}.build1 > logs/${PACKAGE}.build1.xz
 rm -f logs/${PACKAGE}.build1
 
@@ -48,10 +51,13 @@ TMPTAR="$TMPDIR/initial_build.tar"
 
 sudo \
  DEB_BUILD_OPTIONS="nocheck" \
- TZ="/usr/share/zoneinfo/Etc/GMT-14" \
- LANG="fr_CH.UTF-8" \
- LC_ALL="fr_CH.UTF-8" \
- linux64 --uname-2.6 unshare --uts -- $BUILDER --build $BUILDER_OPTS --configfile "$SCRIPT_DIR/pbuilderrc.rebuild" --debbuildopts '-b' --buildresult b2 --logfile logs/${PACKAGE}.build2 --hookdir "$SCRIPT_DIR/pbuilderhooks" --inputfile "$TMPTAR" ${PACKAGE}_*.dsc
+ linux64 --uname-2.6 unshare --uts -- $BUILDER --build $BUILDER_OPTS \
+    --configfile "$SCRIPT_DIR/pbuilderrc.rebuild" \
+    --debbuildopts '-b' \
+    --buildresult b2 \
+    --logfile logs/${PACKAGE}.build2 \
+    --hookdir "$SCRIPT_DIR/pbuilderhooks" \
+    --inputfile "$TMPTAR" ${PACKAGE}_*.dsc
 xz < logs/${PACKAGE}.build2 > logs/${PACKAGE}.build2.xz
 rm -f logs/${PACKAGE}.build2
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/misc.git