Gentoo Archives: gentoo-catalyst

From: Ben Kohler <bkohler@g.o>
To: gentoo-catalyst@l.g.o
Subject: Re: [gentoo-catalyst] [PATCH] targets: Remove ancient locale-deleting code
Date: Sat, 03 Oct 2020 12:03:04
Message-Id: 943a2bb5-3bbb-8ad4-3838-bd60302e0ea4@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH] targets: Remove ancient locale-deleting code by Matt Turner
1 On 10/2/20 10:35 PM, Matt Turner wrote:
2 > This block of code was added in commit ef648688ce8b ("Forward port the
3 > changes from catalyst 1.1.9 to 1.1.10.10 to catalyst2.") in 2005 without
4 > any further explanation. Since locale-gen was first committed to our
5 > glibc package in 2006, we think that locales were handled differently
6 > before (and not packed into /usr/${libdir}/locale/locale-archive).
7 >
8 > Not only is this code unneeded, it can actually cause the locale-archive
9 > to be deleted if the livecd is using a multilib profile! E.g. on a
10 > multilib amd64 profile, where /usr/lib/locale is a symlink to
11 > /usr/lib64/locale, it deletes /usr/lib64/locale/l* which matches
12 > /usr/lib64/locale/locale-archive.
13 >
14 > Because the minimal livecd uses a non-multilib profile, this explains
15 > why it still contained the expected set of locales, while the multilib
16 > admincd did not.
17 >
18 > Thanks go to Ben Kohler, Thomas Deutschmann, and Andreas Hüttel for
19 > figuring out this mystery!
20 >
21 > Bug: https://bugs.gentoo.org/710762
22 > Signed-off-by: Matt Turner <mattst88@g.o>
23 > ---
24 > targets/support/livecdfs-update.sh | 7 -------
25 > 1 file changed, 7 deletions(-)
26 >
27 > diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
28 > index 53844d9f..557d990b 100755
29 > --- a/targets/support/livecdfs-update.sh
30 > +++ b/targets/support/livecdfs-update.sh
31 > @@ -174,13 +174,6 @@ esac
32 >
33 > rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt
34 >
35 > -# Clear out locales
36 > -case ${clst_livecd_type} in
37 > - gentoo-release-minimal|gentoo-release-universal)
38 > - rm -rf /usr/lib/locale/{a,b,c,d,e{l,n_{A,B,C,D,G,H,I,N,P,S,US.,Z},s,t,u},f,g,h,i,j,k,l,m,n,o,p,r,s,t,u,v,w,x,y,z}*
39 > - ;;
40 > -esac
41 > -
42 > # Post configuration
43 > case ${clst_livecd_type} in
44 > gentoo-release-live*)
45
46 Good writeup, look good, thanks!
47
48 -Ben