From 8f3f5f4da6a74504f6af7f289660913766b4b84a Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 6 Apr 2016 12:57:40 +0200 Subject: reproducible debian: explicity set LANG=C|fr_CH.UTF-8 and LANGUAGE=en_US:en|fr_CH:fr --- bin/reproducible_build.sh | 4 ++++ bin/reproducible_common.sh | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 "env TZTZ=\"/usr/share/zoneinfo/Etc/GMT+12\"TZ=\"/usr/share/zoneinfo/Etc/GMT-14\"" if [ "$1" = "debian" ] ; then - write_page "env LANGLANG=CLANG=\"fr_CH.UTF-8\"" + write_page "env LANGLANG=\"C\"LANG=\"fr_CH.UTF-8\"" + write_page "env LANGUAGELANGUAGE=\"en_US:en\"LANGUAGE=\"fr_CH:fr\"" elif [ "$1" = "Arch Linux" ] ; then write_page "env LANGnot setLANG=\"fr_CH.UTF-8\"" else -- cgit v1.2.3-70-g09d2