summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-06-09 02:44:37 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-09 02:44:37 +0200
commit65eb0aaacb1a14ebd7ebf85d0f90b6633598a5f6 (patch)
tree49c3786079e66927ac2d5e34e9a5976731bf445a
parent4fa378c54cb9984e8186e72073fa1b048dddef85 (diff)
downloadjenkins.debian.net-65eb0aaacb1a14ebd7ebf85d0f90b6633598a5f6.tar.xz
reproducible: introduce new variation to capture environment
-rwxr-xr-xbin/reproducible_common.sh2
-rwxr-xr-xbin/reproducible_coreboot.sh1
-rwxr-xr-xetc/pbuilder/rebuild-hooks/D01_modify_environment1
3 files changed, 4 insertions, 0 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index e532b16e..469205dd 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -264,6 +264,8 @@ write_explaination_table() {
write_page "<tr><td>hostname</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
write_page "<tr><td>domainname</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
fi
+ export CAPTURE_ENVIRONMENT="I capture the environment"
+ write_page "<tr><td>env CAPTURE_ENVIRONMENT</td><td><em>not set</em></td><td>CAPTURE_ENVIRONMENT=\"I capture the environment\"</td></tr>"
write_page "<tr><td>env TZ</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT+12\"</td><td>TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"</td></tr>"
write_page "<tr><td>env LANG</td><td>LANG=\"en_GB.UTF-8\"</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>"
write_page "<tr><td>env LC_ALL</td><td><em>unset</em></td><td>LC_ALL=\"fr_CH.UTF-8\"</td></tr>"
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index f238fefe..92dc3ff0 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -137,6 +137,7 @@ export TZ="/usr/share/zoneinfo/Etc/GMT-14"
export LANG="fr_CH.UTF-8"
export LC_ALL="fr_CH.UTF-8"
export PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path"
+export CAPTURE_ENVIRONMENT="I capture the environment"
umask 0002
# use allmost all cores for second build
NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
diff --git a/etc/pbuilder/rebuild-hooks/D01_modify_environment b/etc/pbuilder/rebuild-hooks/D01_modify_environment
index 57c785b3..d9550045 100755
--- a/etc/pbuilder/rebuild-hooks/D01_modify_environment
+++ b/etc/pbuilder/rebuild-hooks/D01_modify_environment
@@ -9,3 +9,4 @@ echo "I: Changing hostname to test build reproducibility" >&2
sed -e '/^127.0.0.1/s/$/ i-capture-the-hostname i-capture-the-hostname.i-capture-the-domain/' -i /etc/hosts
hostname i-capture-the-hostname
domainname i-capture-the-domain
+export CAPTURE_ENVIRONMENT="I capture the environment"