diff options
author | Holger Levsen <holger@layer-acht.org> | 2016-04-06 12:57:40 +0200 |
---|---|---|
committer | Holger Levsen <holger@layer-acht.org> | 2016-04-06 12:57:40 +0200 |
commit | 8f3f5f4da6a74504f6af7f289660913766b4b84a (patch) | |
tree | 3d4e415383171bc39386b45145ccdf32a228c1fc | |
parent | fed8922352bbba91f35dd887165624de1a3b3996 (diff) | |
download | jenkins.debian.net-8f3f5f4da6a74504f6af7f289660913766b4b84a.tar.xz |
reproducible debian: explicity set LANG=C|fr_CH.UTF-8 and LANGUAGE=en_US:en|fr_CH:fr
-rwxr-xr-x | bin/reproducible_build.sh | 4 | ||||
-rwxr-xr-x | bin/reproducible_common.sh | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 376764fc..cb6f2c07 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -559,6 +559,9 @@ BUILDUSERID=1111 BUILDUSERNAME=pbuilder1 export DEB_BUILD_OPTIONS="parallel=$NUM_CPU" export TZ="/usr/share/zoneinfo/Etc/GMT+12" +export LANG="C" +unset LC_ALL +export LANGUAGE="en_US:en" EOF # remember to change the sudoers setting if you change the following command # FIXME: call with --buildinfo-identifier=dummy instead and below @@ -595,6 +598,7 @@ export DEB_BUILD_OPTIONS="parallel=$NUM_CPU" export TZ="/usr/share/zoneinfo/Etc/GMT-14" export LANG="fr_CH.UTF-8" export LC_ALL="fr_CH.UTF-8" +export LANGUAGE="fr_CH:fr" umask 0002 EOF set +e diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 6be67eb1..9f897591 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -395,7 +395,8 @@ write_explaination_table() { fi 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>" if [ "$1" = "debian" ] ; then - write_page "<tr><td>env LANG</td><td>LANG=C</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>" + write_page "<tr><td>env LANG</td><td>LANG=\"C\"</td><td>LANG=\"fr_CH.UTF-8\"</td></tr>" + write_page "<tr><td>env LANGUAGE</td><td>LANGUAGE=\"en_US:en\"</td><td>LANGUAGE=\"fr_CH:fr\"</td></tr>" elif [ "$1" = "Arch Linux" ] ; then write_page "<tr><td>env LANG</td><td><em>not set</em></td><td>LANG=\"fr_CH.UTF-8\"</td></tr>" else |