summaryrefslogtreecommitdiffstats
path: root/meta
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:33 +0100
commitd57de67357a4cd3da2824f8bd2b02d100f1ac9c3 (patch)
treeca201266a94162eecb8e49dc970026e306d53e3f /meta
parent3ddde5f32afe9225994df607f6b8dfcc58f6bdc7 (diff)
downloadpoky-d57de67357a4cd3da2824f8bd2b02d100f1ac9c3.tar.gz
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. (From OE-Core rev: 833d4c0fe804a1f7524b3d4b75cbcdd65c31ddac) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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"
488export MAKE = "make" 488export MAKE = "make"
489EXTRA_OEMAKE = "" 489EXTRA_OEMAKE = ""
490EXTRA_OECONF = "" 490EXTRA_OECONF = ""
491export LC_ALL = "C" 491export LC_ALL = "en_US.UTF-8"
492 492
493################################################################## 493##################################################################
494# Patch handling. 494# 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 @@
1#!/bin/sh 1#!/bin/sh
2 2
3[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \ 3[ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \
4 LC_ALL=en_US.UTF-8 \
4 http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \ 5 http_proxy="$http_proxy" https_proxy="$https_proxy" ftp_proxy="$ftp_proxy" \
5 no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@" 6 no_proxy="$no_proxy" all_proxy="$all_proxy" GIT_PROXY_COMMAND="$GIT_PROXY_COMMAND" "$0" "$@"
6[ -f /etc/environment ] && . /etc/environment 7[ -f /etc/environment ] && . /etc/environment