From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A859138359 for ; Sat, 3 Oct 2020 16:03:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81CD2E083D; Sat, 3 Oct 2020 16:03:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B8ADE083D for ; Sat, 3 Oct 2020 16:03:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2AA69335D07 for ; Sat, 3 Oct 2020 16:03:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99BAFEC for ; Sat, 3 Oct 2020 16:03:09 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1601695258.234286ffae459764e2dfaf55c94e44ec3ad4e9cd.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 234286ffae459764e2dfaf55c94e44ec3ad4e9cd X-VCS-Branch: master Date: Sat, 3 Oct 2020 16:03:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d361d47f-e9ce-47a2-8a97-e8f42961fef5 X-Archives-Hash: 98d2b32796e267b10fba0d76bcd79178 commit: 234286ffae459764e2dfaf55c94e44ec3ad4e9cd Author: Matt Turner gentoo org> AuthorDate: Sat Oct 3 03:20:58 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Oct 3 03:20:58 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=234286ff 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 gentoo.org> targets/support/livecdfs-update.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 53844d9f..557d990b 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -174,13 +174,6 @@ esac rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt -# Clear out locales -case ${clst_livecd_type} in - gentoo-release-minimal|gentoo-release-universal) - 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-release-live*)