commit: 8a6d831adcc3edc23c751d6fe6f600765bcc37b2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jan 22 18:51:00 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 22 18:51:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8a6d831a
scripts/bootstrap-prefix.sh: fix glibc mask/unmask logic Closes: https://bugs.gentoo.org/824482 Signed-off-by: Sam James <sam <AT> gentoo.org> scripts/bootstrap-prefix.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index eecc8be6db..76383c0210 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -510,10 +510,21 @@ bootstrap_setup() { if ! [ -d "${ROOT}"/etc/portage/package.mask ]; then mkdir "${ROOT}"/etc/portage/package.mask fi + + if ! [ -d "${ROOT}"/etc/portage/package.unmask ]; then + mkdir "${ROOT}"/etc/portage/package.unmask + fi + cat >> "${ROOT}"/etc/portage/package.mask/glibc <<-EOF # Temporary mask for newer glibc until bootstrapping issues are fixed. - # bug #824482: Avoid glibc-2.34 for now. - <sys-libs/glibc-2.34_p1 + # bug #824482: Avoid glibc-2.34 for now. See package.unmask/glibc too. + >=sys-libs/glibc-2.34 + EOF + + cat >> "${ROOT}"/etc/portage/package.unmask/glibc <<-EOF + # Temporary mask for newer glibc until bootstrapping issues are fixed. + # bug #824482: Avoid glibc-2.34 for now. See package.mask/glibc too. + >=sys-libs/glibc-2.34_p1 EOF fi
