On Tue, 7 Apr 2020 17:25:44 -0700 Matt Turner <[email protected]> wrote:
> On Tue, Apr 7, 2020 at 2:26 PM Alec Warner <[email protected]> wrote: > > On Sun, Mar 29, 2020 at 8:26 PM Matt Turner <[email protected]> > > wrote: > >> > >> 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 <[email protected]> > >> --- > >> targets/stage1/chroot.sh | 12 ++++++++++++ > >> 1 file changed, 12 insertions(+) > >> > >> diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh > >> index 0caf49ee..88a36481 100755 > >> --- a/targets/stage1/chroot.sh > >> +++ b/targets/stage1/chroot.sh > >> @@ -57,6 +57,11 @@ make_destpath /tmp/stage1root > >> run_merge "--oneshot --nodeps sys-apps/baselayout" > >> ${clst_sed} -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} > >> > >> +for etc in /etc /tmp/stage1root/etc; do > >> + echo "LANG=C.UTF8" > ${etc}/env.d/02locale > >> +done > >> +update_env_settings > >> + > > > > > > if /tmp/stage1root is "${clst_root_path}" I think it might behoove > > you to use it here rather than hard coding it. Same as below. > > Thank you. Fixed and pushed (since I realized that USE=compile-locales > is actually already unmasked on the latest stable glibc). > Thanks Matt And yes, after all the work it took to fix the hard coded paths throughout the code... If need be add another variable to the defaults so that it is all in one place where it is easier to change or override as the need may arise.
