From 0aa49828ae253a22a3327f4024fcada801e64245 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 29 Mar 2020 18:15:25 -0700 Subject: [PATCH] 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 --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index aa31fb15e8bd..c06e25dba133 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" -- 2.26.2