commit: 99af83b914b2d7a3a0f4e999e71c03261811b1f5
Author: Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Mon Aug 18 12:25:20 2025 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Aug 18 12:25:20 2025 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=99af83b9
Support locale-gen-3 (the perl version)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
targets/stage1/chroot.sh | 6 +++++-
targets/support/chroot-functions.sh | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index e0587b59..541c060f 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -91,7 +91,11 @@ run_merge --implicit-system-deps=n --oneshot
"${buildpkgs[@]}"
# not run locale-gen when ROOT is set. Since we've set LANG, we need to run
# locale-gen explicitly.
if [ -x "$(command -v locale-gen)" ]; then
- locale-gen --destdir "$ROOT"/ || die "locale-gen failed"
+ if ! locale-gen -V | grep -q '^locale-gen-2\.'; then
+ locale-gen --config /etc/locale.gen --prefix "$ROOT"/
+ else
+ locale-gen --destdir "$ROOT"/
+ fi || die "locale-gen failed"
fi
# Why are we removing these? Don't we need them for final make.conf?
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index d8472d46..08738d0a 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -284,7 +284,7 @@ show_debug() {
}
readonly locales="
-C.UTF8 UTF-8
+C.UTF-8 UTF-8
"
if [[ ${RUN_DEFAULT_FUNCS} != no ]]
