summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2016-06-01 09:21:06 +0000
committerHolger Levsen <holger@layer-acht.org>2016-06-01 11:33:32 +0200
commitcad6f46843c4949815011c3e437d7afbe4821917 (patch)
tree1650d688c4f3ad47529c011f3e14888dca53653a
parent647a1759dead6cb0fce32708c73ffc03c62fbef8 (diff)
downloadjenkins.debian.net-cad6f46843c4949815011c3e437d7afbe4821917.tar.xz
reproducible debian: vary HOME between builds
This is done by setting the BUILD_HOME pbuilder conf value in the temporary pbuilderrc, which is then used by pbuilder to set HOME. Remember that those home directories don't actually exist, as build processes are not supposed to write to HOME nor rely on that.
-rwxr-xr-xbin/reproducible_build.sh2
-rwxr-xr-xbin/reproducible_common.sh1
2 files changed, 3 insertions, 0 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 57e4edff..8d851966 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -557,6 +557,7 @@ first_build() {
cat > "$TMPCFG" << EOF
BUILDUSERID=1111
BUILDUSERNAME=pbuilder1
+BUILD_HOME=/nonexistent/first-build
export DEB_BUILD_OPTIONS="parallel=$NUM_CPU"
export TZ="/usr/share/zoneinfo/Etc/GMT+12"
export LANG="C"
@@ -606,6 +607,7 @@ second_build() {
cat > "$TMPCFG" << EOF
BUILDUSERID=2222
BUILDUSERNAME=pbuilder2
+BUILD_HOME=/nonexistent/second-build
export DEB_BUILD_OPTIONS="parallel=$NUM_CPU"
export TZ="/usr/share/zoneinfo/Etc/GMT-14"
export LANG="$locale.UTF-8"
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 4e8a4716..7a1668da 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -478,6 +478,7 @@ write_variation_table() {
write_page "<tr><td>env BUILDUSERID</td><td>BUILDUSERID=\"1111\"</td><td>BUILDUSERID=\"2222\"</td></tr>"
write_page "<tr><td>env BUILDUSERNAME</td><td>BUILDUSERNAME=\"pbuilder1\"</td><td>BUILDUSERNAME=\"pbuilder2\"</td></tr>"
write_page "<tr><td>env USER</td><td>USER=\"pbuilder1\"</td><td>USER=\"pbuilder2\"</td></tr>"
+ write_page "<tr><td>env HOME</td><td>HOME=\"/nonexistent/first-build\"</td><td>HOME=\"/nonexistent/second-build\"</td></tr>"
write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"
write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />&nbsp;&nbsp;XXX on amd64 and i386: 18 or 17<br />&nbsp;&nbsp;XXX on armhf: 8, 4 or 2</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />&nbsp;&nbsp;YYY on amd64 and i386: 17 or 18 (!= the first build)<br />&nbsp;&nbsp;YYY on armhf: 8, 4, or 2 (not varied systematically)</td></tr>"