commit: 0aa49828ae253a22a3327f4024fcada801e64245
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 01:15:25 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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"
