summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorPaul Wise <pabs@debian.org>2016-08-31 15:50:26 +0800
committerMattia Rizzolo <mattia@debian.org>2016-08-31 13:37:15 +0000
commit42c36550ec0ff33b27f15e10f6f69f98f6c36bc4 (patch)
tree11bdcd3ce5f0fd23faa66853b09271ecd43e8a71 /bin
parente5d053aefa5f6d5f54dc5ce4b33ce86ec4e26a0b (diff)
downloadjenkins.debian.net-42c36550ec0ff33b27f15e10f6f69f98f6c36bc4.tar.xz
Vary the GECOS of the two build users
This affects at least the Debian package libforms. Signed-off-by: Mattia Rizzolo <mattia@debian.org>
Diffstat (limited to 'bin')
-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 99a73a95..02b70b27 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -587,6 +587,7 @@ first_build() {
cat > "$TMPCFG" << EOF
BUILDUSERID=1111
export BUILDUSERNAME=pbuilder1
+export BUILDUSERGECOS="first user,first room,first work-phone,first home-phone,first other"
# pbuilder sets HOME to the value of BUILD_HOME…
BUILD_HOME=/nonexistent/first-build
export DEB_BUILD_OPTIONS="parallel=$NUM_CPU"
@@ -644,6 +645,7 @@ second_build() {
cat > "$TMPCFG" << EOF
BUILDUSERID=2222
export BUILDUSERNAME=pbuilder2
+export BUILDUSERGECOS="second user,second room,second work-phone,second home-phone,second other"
# pbuilder sets HOME to the value of BUILD_HOME…
BUILD_HOME=/nonexistent/second-build
export DEB_BUILD_OPTIONS="parallel=$NUM_CPU"
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 2b668e2e..11f247a3 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -412,6 +412,7 @@ write_variation_table() {
write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
write_page "<tr><td>build path</td><td>/build-first <em>(not varied for stretch)</em></td><td>/build-second <em>(not varied for stretch)</em></td></tr>"
write_page "<tr><td>user's login shell</td><td>/bin/sh</td><td>/bin/bash</td></tr>"
+ write_page "<tr><td>user's <a href="https://en.wikipedia.org/wiki/Gecos_field">GECOS</a></td><td>first user,first room,first work-phone,first home-phone,first other</td><td>second user,second room,second work-phone,second home-phone,second other</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>"
write_page "<tr><td>UTS namespace</td><td><em>shared with the host</em></td><td><em>modified using</em> /usr/bin/unshare --uts</td></tr>"
else