summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2020-03-29 18:15:25 -0700
committerMatt Turner <mattst88@gentoo.org>2020-03-29 18:37:50 -0700
commit0aa49828ae253a22a3327f4024fcada801e64245 (patch)
tree8bfdcee3f293b0085d7696b7881e02e56989d53b /scripts
parentsys-apps/logwatch: bump to v7.5.3 (diff)
downloadgentoo-0aa49828ae253a22a3327f4024fcada801e64245.tar.gz
gentoo-0aa49828ae253a22a3327f4024fcada801e64245.tar.bz2
gentoo-0aa49828ae253a22a3327f4024fcada801e64245.zip
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@gentoo.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bootstrap.sh2
1 files changed, 1 insertions, 1 deletions
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"