diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-02-17 19:40:04 +0100 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-02-17 19:51:56 +0100 |
| commit | c8147a3512fbd7e721940a47e3d2b125078d1ad8 (patch) | |
| tree | 5f1010edabec9b6ec0b879416108afffa5508864 | |
| parent | 76dec8507e2e767db07f967644ed8958f85cd5a2 (diff) | |
| download | devtools32-c8147a3512fbd7e721940a47e3d2b125078d1ad8.tar.xz | |
mkarchroot: Set LANG=en_US.UTF-8
In order to have an UTF-8 locale in the build root. This is something
normally set on real machines but is not set from our chroots. Meson,
for example, loudly complains when the locale charset is not UTF-8.
I'd like to have C.UTF-8, as most other distributions do. Unfortunately,
it's not part of vanilla glibc; en_US.UTF-8 will have to do.
mkarchroot already creates roots with both en_US.UTF-8 and de_DE.UTF-8,
the latter because builds of gcc (perhaps used to) require it.
Bump the CHROOT_VERSION due to the setting change.
| -rw-r--r-- | arch-nspawn.in | 2 | ||||
| -rw-r--r-- | mkarchroot.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index e46b57f..b5fcc9d 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -10,7 +10,7 @@ m4_include(lib/common.sh) -CHROOT_VERSION='v3' +CHROOT_VERSION='v4' working_dir='' diff --git a/mkarchroot.in b/mkarchroot.in index 4d8efb0..c4bb51a 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -10,7 +10,7 @@ m4_include(lib/common.sh) -CHROOT_VERSION='v3' +CHROOT_VERSION='v4' working_dir='' @@ -72,7 +72,7 @@ pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" -echo 'LANG=C' > "$working_dir/etc/locale.conf" +echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf" echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot" systemd-machine-id-setup --root="$working_dir" |