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 71C63138359 for ; Sat, 3 Oct 2020 03:35:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E21FE09BC; Sat, 3 Oct 2020 03:35:14 +0000 (UTC) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) (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 37A23E09BC for ; Sat, 3 Oct 2020 03:35:14 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id y14so2128786pgf.12 for ; Fri, 02 Oct 2020 20:35:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VAc+wYIsVa5lfW2THhXtNjlHhkwgYsk8RmKCSedi/d4=; b=Se68g7xl/5zkAUiFSAtQnnjW6LSuWsRQUdp4K8XL0hdjJoFHQhwNYr70t2ANbTGXgs w0zCSM5Qor/wynAq3HWlrH4GCW083Sx9qyiOUM0ImXeln1S4Hksv3DvonCnb9v+WeoNy Tt0KXtUfc2YIOKk/NOyqyzIQ/K2J9UCb/XgpyuBkOASDLrCPsAehfOgBU/V4DT0Ju6g8 QJS1xZtIbfkEVG8Zk5Wf7TAWpmQ3/8K4LNtnHXTEG4GslgM8bEWLVhgXlj1YKEjVOcss iHbq/xy8JK1QobZe2sqA7rtkyneV4IIPaqobU/zZcdOWXb6XTn9S8SwhRPuube/36wQY Gurw== X-Gm-Message-State: AOAM533GWFCRts5W/QuHGl5xDgTszITdf6QxZhin34vaYzc6KkSDOF3/ o5qAxf4DevnflRS6CDoLD66cKhM1GzU= X-Google-Smtp-Source: ABdhPJz+1QjzqIhBgpbO0Hp6de21zKlJaHbW40UbJGiiSYXitmAY0T1vaG9HYPu/QSAq4wkER1MG9g== X-Received: by 2002:aa7:9157:0:b029:142:2501:3984 with SMTP id 23-20020aa791570000b029014225013984mr5879416pfi.73.1601696112705; Fri, 02 Oct 2020 20:35:12 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id y10sm3589885pfp.77.2020.10.02.20.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2020 20:35:11 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH] targets: Remove ancient locale-deleting code Date: Fri, 2 Oct 2020 20:35:08 -0700 Message-Id: <20201003033508.38621-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 8547c693-f93e-4a0a-bb5c-e07fb462e576 X-Archives-Hash: 3ccc89d99aab457e11e52391562053a2 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 --- 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*) -- 2.26.2