diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-06-03 13:29:47 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-06-04 05:08:37 +0900 |
| commit | c9bd01ae902d66acd8647a1cc0167bc0d246cbc8 (patch) | |
| tree | 54aa784cc27cfb2f23824caa7333d6dd9df10655 | |
| parent | ea4f2d5fb7875e47441f736d6298f3930180647b (diff) | |
| download | systemd-c9bd01ae902d66acd8647a1cc0167bc0d246cbc8.tar.gz | |
meson: Switch default-locale default to C.UTF-8
We're already using C.UTF-8 as the default locale for nspawn. Let's
make the same change for the default-locale option instead of deciding
what to use based on the locale used by the host system. Users can
still override the locale using the default-locale option if needed.
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rwxr-xr-x | tools/choose-default-locale.sh | 12 |
3 files changed, 1 insertions, 22 deletions
diff --git a/meson.build b/meson.build index 04b90c97a9..dc3cc7f8b6 100644 --- a/meson.build +++ b/meson.build @@ -929,15 +929,6 @@ ntp_servers = get_option('ntp-servers') conf.set_quoted('NTP_SERVERS', ntp_servers) default_locale = get_option('default-locale') -if default_locale == '' - if not meson.is_cross_build() - choose_default_locale_sh = find_program('tools/choose-default-locale.sh') - default_locale = run_command(choose_default_locale_sh, - check : true).stdout().strip() - else - default_locale = 'C.UTF-8' - endif -endif conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale) localegen_path = get_option('localegen-path') diff --git a/meson_options.txt b/meson_options.txt index 26d1170c50..6c816abd65 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -300,7 +300,7 @@ option('default-kill-user-processes', type : 'boolean', description : 'the default value for KillUserProcesses= setting') option('gshadow', type : 'boolean', description : 'support for shadow group') -option('default-locale', type : 'string', value : '', +option('default-locale', type : 'string', value : 'C.UTF-8', description : 'default locale used when /etc/locale.conf does not exist') option('localegen-path', type : 'string', value : '', description : 'absolute path to the locale-gen binary in case the system is using locale-gen') diff --git a/tools/choose-default-locale.sh b/tools/choose-default-locale.sh deleted file mode 100755 index a5158cf7c5..0000000000 --- a/tools/choose-default-locale.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: LGPL-2.1-or-later -set -e - -# Fedora uses C.utf8 but Debian uses C.UTF-8 -if locale -a | grep -xq -E 'C\.(utf8|UTF-8)'; then - echo 'C.UTF-8' -elif locale -a | grep -xqF 'en_US.utf8'; then - echo 'en_US.UTF-8' -else - echo 'C' -fi |