1 |
On Tue, 7 Apr 2020 17:25:44 -0700 |
2 |
Matt Turner <mattst88@g.o> wrote: |
3 |
|
4 |
> On Tue, Apr 7, 2020 at 2:26 PM Alec Warner <antarus@g.o> wrote: |
5 |
> > On Sun, Mar 29, 2020 at 8:26 PM Matt Turner <mattst88@g.o> |
6 |
> > wrote: |
7 |
> >> |
8 |
> >> Stable glibc now always provides a UTF-8 capable locale, which many |
9 |
> >> packages require. Set this as the default LANG. |
10 |
> >> |
11 |
> >> Running locale-gen in stage1 should also solve bug #536938. |
12 |
> >> |
13 |
> >> Bug: https://bugs.gentoo.org/536938 |
14 |
> >> Bug: https://bugs.gentoo.org/710762 |
15 |
> >> Bug: https://bugs.gentoo.org/714906 |
16 |
> >> Signed-off-by: Matt Turner <mattst88@g.o> |
17 |
> >> --- |
18 |
> >> targets/stage1/chroot.sh | 12 ++++++++++++ |
19 |
> >> 1 file changed, 12 insertions(+) |
20 |
> >> |
21 |
> >> diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh |
22 |
> >> index 0caf49ee..88a36481 100755 |
23 |
> >> --- a/targets/stage1/chroot.sh |
24 |
> >> +++ b/targets/stage1/chroot.sh |
25 |
> >> @@ -57,6 +57,11 @@ make_destpath /tmp/stage1root |
26 |
> >> run_merge "--oneshot --nodeps sys-apps/baselayout" |
27 |
> >> ${clst_sed} -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} |
28 |
> >> |
29 |
> >> +for etc in /etc /tmp/stage1root/etc; do |
30 |
> >> + echo "LANG=C.UTF8" > ${etc}/env.d/02locale |
31 |
> >> +done |
32 |
> >> +update_env_settings |
33 |
> >> + |
34 |
> > |
35 |
> > |
36 |
> > if /tmp/stage1root is "${clst_root_path}" I think it might behoove |
37 |
> > you to use it here rather than hard coding it. Same as below. |
38 |
> |
39 |
> Thank you. Fixed and pushed (since I realized that USE=compile-locales |
40 |
> is actually already unmasked on the latest stable glibc). |
41 |
> |
42 |
|
43 |
Thanks Matt |
44 |
|
45 |
And yes, after all the work it took to fix the hard coded paths |
46 |
throughout the code... If need be add another variable to the |
47 |
defaults so that it is all in one place where it is easier to change |
48 |
or override as the need may arise. |