From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2246A138350 for ; Wed, 8 Apr 2020 00:25:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27183E0948; Wed, 8 Apr 2020 00:25:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EA65E0948 for ; Wed, 8 Apr 2020 00:25:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8699034F0E2 for ; Wed, 8 Apr 2020 00:25:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A7701C1 for ; Wed, 8 Apr 2020 00:25:22 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586301787.f0e772bd3905d02d691d0e41b3a8e3bd3c10e2fe.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/chroot.sh X-VCS-Directories: targets/stage1/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f0e772bd3905d02d691d0e41b3a8e3bd3c10e2fe X-VCS-Branch: master Date: Wed, 8 Apr 2020 00:25:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e110a2c9-cd0d-4952-986c-5f3a31065fdc X-Archives-Hash: 69df5675644601fc0da1dbd6d303a81d commit: f0e772bd3905d02d691d0e41b3a8e3bd3c10e2fe Author: Matt Turner gentoo org> AuthorDate: Fri Mar 27 23:28:11 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Apr 7 23:23:07 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f0e772bd targets: Set LANG=C.UTF8 Stable glibc now always provides a UTF-8 capable locale, which many packages require. Set this as the default LANG. Running locale-gen in stage1 should also solve bug #536938. Bug: https://bugs.gentoo.org/536938 Bug: https://bugs.gentoo.org/710762 Bug: https://bugs.gentoo.org/714906 Signed-off-by: Matt Turner gentoo.org> targets/stage1/chroot.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh index d409de39..60e32c60 100755 --- a/targets/stage1/chroot.sh +++ b/targets/stage1/chroot.sh @@ -57,6 +57,11 @@ make_destpath "${clst_root_path}" run_merge "--oneshot --nodeps sys-apps/baselayout" ${clst_sed} -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} +for etc in /etc "${clst_root_path}"/etc; do + echo "LANG=C.UTF8" > ${etc}/env.d/02locale +done +update_env_settings + # Now, we install our packages if [ -e ${clst_make_conf} ]; then echo "CATALYST_USE=\"-* build ${BINDIST} ${clst_CATALYST_USE}\"" >> ${clst_make_conf} @@ -71,6 +76,13 @@ fi run_merge "--oneshot ${clst_buildpkgs}" +# TODO: Drop this when locale-gen in stable glibc supports ROOT. +# +# locale-gen does not support the ROOT variable, and as such glibc simply does +# not run locale-gen when ROOT is set. Since we've set LANG, we need to run +# locale-gen explicitly. +locale-gen --destdir "${clst_root_path}"/ || die "locale-gen failed" + # Why are we removing these? Don't we need them for final make.conf? for useexpand in ${clst_HOSTUSEEXPAND}; do x="clst_${useexpand}"