Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH] targets: Remove ancient locale-deleting code
Date: Sat, 03 Oct 2020 03:35:15
Message-Id: 20201003033508.38621-1-mattst88@gentoo.org
1 This block of code was added in commit ef648688ce8b ("Forward port the
2 changes from catalyst 1.1.9 to 1.1.10.10 to catalyst2.") in 2005 without
3 any further explanation. Since locale-gen was first committed to our
4 glibc package in 2006, we think that locales were handled differently
5 before (and not packed into /usr/${libdir}/locale/locale-archive).
6
7 Not only is this code unneeded, it can actually cause the locale-archive
8 to be deleted if the livecd is using a multilib profile! E.g. on a
9 multilib amd64 profile, where /usr/lib/locale is a symlink to
10 /usr/lib64/locale, it deletes /usr/lib64/locale/l* which matches
11 /usr/lib64/locale/locale-archive.
12
13 Because the minimal livecd uses a non-multilib profile, this explains
14 why it still contained the expected set of locales, while the multilib
15 admincd did not.
16
17 Thanks go to Ben Kohler, Thomas Deutschmann, and Andreas Hüttel for
18 figuring out this mystery!
19
20 Bug: https://bugs.gentoo.org/710762
21 Signed-off-by: Matt Turner <mattst88@g.o>
22 ---
23 targets/support/livecdfs-update.sh | 7 -------
24 1 file changed, 7 deletions(-)
25
26 diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
27 index 53844d9f..557d990b 100755
28 --- a/targets/support/livecdfs-update.sh
29 +++ b/targets/support/livecdfs-update.sh
30 @@ -174,13 +174,6 @@ esac
31
32 rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt
33
34 -# Clear out locales
35 -case ${clst_livecd_type} in
36 - gentoo-release-minimal|gentoo-release-universal)
37 - 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}*
38 - ;;
39 -esac
40 -
41 # Post configuration
42 case ${clst_livecd_type} in
43 gentoo-release-live*)
44 --
45 2.26.2

Replies