From ee5ff08d87a84f957af29bdf96ef232efdb229ae Mon Sep 17 00:00:00 2001 From: Frank de Brabander Date: Tue, 6 Dec 2022 19:18:05 +0100 Subject: bitbake: bin/utils: Ensure locale en_US.UTF-8 is available on the system Get rid of the duplicate code and add extra check that the locale en_US.UTF-8 is available on the system. This new helper method is now located right above the method filter_environment() which sets LC_ALL environment variable to 'en_US.UTF-8'. [YOCTO #10165] (Bitbake rev: 0c6f86b60cfba67c20733516957c0a654eb2b44c) Signed-off-by: Frank de Brabander Signed-off-by: Richard Purdie (cherry picked from commit a4ce040a6fd540a1cac52f808f909f9fcf8c961c) Signed-off-by: Steve Sakoman --- bitbake/lib/bb/utils.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'bitbake/lib/bb') diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index cdb3c6864b..3f7f82d17d 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -13,6 +13,7 @@ import errno import logging import bb import bb.msg +import locale import multiprocessing import fcntl import importlib @@ -606,6 +607,21 @@ def preserved_envvars(): ] return v + preserved_envvars_exported() +def check_system_locale(): + """Make sure the required system locale are available and configured""" + default_locale = locale.getlocale(locale.LC_CTYPE) + + try: + locale.setlocale(locale.LC_CTYPE, ("en_US", "UTF-8")) + except: + sys.exit("Please make sure locale 'en_US.UTF-8' is available on your system") + else: + locale.setlocale(locale.LC_CTYPE, default_locale) + + if sys.getfilesystemencoding() != "utf-8": + sys.exit("Please use a locale setting which supports UTF-8 (such as LANG=en_US.UTF-8).\n" + "Python can't change the filesystem locale after loading so we need a UTF-8 when Python starts or things won't work.") + def filter_environment(good_vars): """ Create a pristine environment for bitbake. This will remove variables that -- cgit v1.2.3-54-g00ecf