| 1 |
commit: 711dd4642bfc85871754a360318429be1a992884 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 3 03:20:58 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 3 16:04:04 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=711dd464 |
| 7 |
|
| 8 |
targets: Remove ancient locale-deleting code |
| 9 |
|
| 10 |
This block of code was added in commit ef648688ce8b ("Forward port the |
| 11 |
changes from catalyst 1.1.9 to 1.1.10.10 to catalyst2.") in 2005 without |
| 12 |
any further explanation. Since locale-gen was first committed to our |
| 13 |
glibc package in 2006, we think that locales were handled differently |
| 14 |
before (and not packed into /usr/${libdir}/locale/locale-archive). |
| 15 |
|
| 16 |
Not only is this code unneeded, it can actually cause the locale-archive |
| 17 |
to be deleted if the livecd is using a multilib profile! E.g. on a |
| 18 |
multilib amd64 profile, where /usr/lib/locale is a symlink to |
| 19 |
/usr/lib64/locale, it deletes /usr/lib64/locale/l* which matches |
| 20 |
/usr/lib64/locale/locale-archive. |
| 21 |
|
| 22 |
Because the minimal livecd uses a non-multilib profile, this explains |
| 23 |
why it still contained the expected set of locales, while the multilib |
| 24 |
admincd did not. |
| 25 |
|
| 26 |
Thanks go to Ben Kohler, Thomas Deutschmann, and Andreas Hüttel for |
| 27 |
figuring out this mystery! |
| 28 |
|
| 29 |
Bug: https://bugs.gentoo.org/710762 |
| 30 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 31 |
(cherry picked from commit 234286ffae459764e2dfaf55c94e44ec3ad4e9cd) |
| 32 |
|
| 33 |
targets/support/livecdfs-update.sh | 7 ------- |
| 34 |
1 file changed, 7 deletions(-) |
| 35 |
|
| 36 |
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh |
| 37 |
index 023bb0f0..836dcdcd 100755 |
| 38 |
--- a/targets/support/livecdfs-update.sh |
| 39 |
+++ b/targets/support/livecdfs-update.sh |
| 40 |
@@ -211,13 +211,6 @@ then |
| 41 |
fi |
| 42 |
fi |
| 43 |
|
| 44 |
-# Clear out locales |
| 45 |
-case ${clst_livecd_type} in |
| 46 |
- gentoo-release-minimal|gentoo-release-universal|gentoo-gamecd) |
| 47 |
- 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}* |
| 48 |
- ;; |
| 49 |
-esac |
| 50 |
- |
| 51 |
# Post configuration |
| 52 |
case ${clst_livecd_type} in |
| 53 |
gentoo-gamecd ) |
Archives