diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-10-02 20:20:58 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-10-03 09:04:04 -0700 |
| commit | 711dd4642bfc85871754a360318429be1a992884 (patch) | |
| tree | 642cb69adf0e41ac550f6794716b02dd240d3913 | |
| parent | catalyst 3.0.13 (diff) | |
| download | catalyst-711dd464.tar.gz catalyst-711dd464.tar.bz2 catalyst-711dd464.zip | |
targets: Remove ancient locale-deleting code
This block of code was added in commit ef648688ce8b ("Forward port the
changes from catalyst 1.1.9 to 1.1.10.10 to catalyst2.") in 2005 without
any further explanation. Since locale-gen was first committed to our
glibc package in 2006, we think that locales were handled differently
before (and not packed into /usr/${libdir}/locale/locale-archive).
Not only is this code unneeded, it can actually cause the locale-archive
to be deleted if the livecd is using a multilib profile! E.g. on a
multilib amd64 profile, where /usr/lib/locale is a symlink to
/usr/lib64/locale, it deletes /usr/lib64/locale/l* which matches
/usr/lib64/locale/locale-archive.
Because the minimal livecd uses a non-multilib profile, this explains
why it still contained the expected set of locales, while the multilib
admincd did not.
Thanks go to Ben Kohler, Thomas Deutschmann, and Andreas Hüttel for
figuring out this mystery!
Bug: https://bugs.gentoo.org/710762
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 234286ffae459764e2dfaf55c94e44ec3ad4e9cd)
| -rwxr-xr-x | targets/support/livecdfs-update.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 023bb0f0..836dcdcd 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -211,13 +211,6 @@ then fi fi -# Clear out locales -case ${clst_livecd_type} in - gentoo-release-minimal|gentoo-release-universal|gentoo-gamecd) - 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}* - ;; -esac - # Post configuration case ${clst_livecd_type} in gentoo-gamecd ) |