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