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 9B433138239 for ; Mon, 30 Mar 2020 01:38:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8C91E091C; Mon, 30 Mar 2020 01:38:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B7D81E091C for ; Mon, 30 Mar 2020 01:38:00 +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 C281A34EFF3 for ; Mon, 30 Mar 2020 01:37:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71B1818B for ; Mon, 30 Mar 2020 01:37:58 +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: <1585532270.0aa49828ae253a22a3327f4024fcada801e64245.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: scripts/ X-VCS-Repository: repo/gentoo X-VCS-Files: scripts/bootstrap.sh X-VCS-Directories: scripts/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 0aa49828ae253a22a3327f4024fcada801e64245 X-VCS-Branch: master Date: Mon, 30 Mar 2020 01:37:58 +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: c3b4a970-d8f0-4e29-872f-95c01d39a884 X-Archives-Hash: 9ec96d8ff72fab7aba496199d5f2b681 commit: 0aa49828ae253a22a3327f4024fcada801e64245 Author: Matt Turner gentoo org> AuthorDate: Mon Mar 30 01:15:25 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Mar 30 01:37:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa49828 scripts/bootstrap.sh: Allow CONFIG_PROTECT With a CONFIG_PROTECT="-*" setting, glibc will overwrite the system's /etc/locale.gen file in src_install() with its default-empty one. In pkg_postinst() it reads the empty /etc/locale.gen it just installed, and as a result generates all locales. So, allow CONFIG_PROTECT to be passed through unmolested so long as it starts with "-*". This allows locales to be selectively enabled when bootstrap.sh is run with CONFIG_PROTECT="-* /etc/locale.gen". Signed-off-by: Matt Turner gentoo.org> scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index aa31fb15e8b..c06e25dba13 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -306,7 +306,7 @@ echo --------------------------------------------------------------------------- [[ -x /usr/bin/gcc-config ]] && GCC_CONFIG="/usr/bin/gcc-config" # Allow portage to overwrite stuff -export CONFIG_PROTECT="-*" +[[ $CONFIG_PROTECT != "-*"* ]] && export CONFIG_PROTECT="-*" # disable collision-protection export FEATURES="${FEATURES} -collision-protect"