summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 12:30:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 22:26:26 +0100
commit833d4c0fe804a1f7524b3d4b75cbcdd65c31ddac (patch)
treef640090f48ae2a87768d165c6cf1ac1273fa4640
parentd13f0ac614f1d1e2ef2c8ddc71cbfcf76a8dc3f2 (diff)
downloadopenembedded-core-contrib-833d4c0fe804a1f7524b3d4b75cbcdd65c31ddac.tar.gz
openembedded-core-contrib-833d4c0fe804a1f7524b3d4b75cbcdd65c31ddac.tar.bz2
openembedded-core-contrib-833d4c0fe804a1f7524b3d4b75cbcdd65c31ddac.zip
bitbake.conf/toolchain-shar-extract: Use en_US.UTF-8 as locale
Under python 3, if we spawn python processes, we need to have a UTF-8 locale, else python's file access methods will use ascii. You can't change that mode once the interpreter is started so we have to ensure a locale is set. Ideally we'd use C.UTF-8 since OE already forces the C locale but not all distros support that and we need to set something so en_US.UTF-8 seems as standard we we can get. This matches the change in bitbake revision 8902c29638411d312e6fc4a197707e5742652e15 Also set this into the environment used when installing SDKs since python can be run and we need to ensure we use a standardised locale which is available from things like buildtools-tarball. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/files/toolchain-shar-extract.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8a84e53c1b..acef30b714 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -488,7 +488,7 @@ export BUILD_NM = "${BUILD_PREFIX}nm"
export MAKE = "make"
EXTRA_OEMAKE = ""
EXTRA_OECONF = ""
-export LC_ALL = "C"
+export LC_ALL = "en_US.UTF-8"
##################################################################
# Patch handling.
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index 397be11198..d1ce86dccc 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -1,6 +1,7 @@
#!/bin/sh
[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \
+ LC_ALL=en_US.UTF-8 \
http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \
no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@"
[ -f /etc/environment ] && . /etc/environment