diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-03-29 18:15:25 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-03-29 18:37:50 -0700 |
| commit | 0aa49828ae253a22a3327f4024fcada801e64245 (patch) | |
| tree | 8bfdcee3f293b0085d7696b7881e02e56989d53b /scripts | |
| parent | sys-apps/logwatch: bump to v7.5.3 (diff) | |
| download | gentoo-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-x | scripts/bootstrap.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" |