From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 810A8158087 for ; Sat, 22 Jan 2022 18:51:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9FAA2BC004; Sat, 22 Jan 2022 18:51:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4277C2BC004 for ; Sat, 22 Jan 2022 18:51:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F191B342BC4 for ; Sat, 22 Jan 2022 18:51:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 27073275 for ; Sat, 22 Jan 2022 18:51:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642877460.8a6d831adcc3edc23c751d6fe6f600765bcc37b2.sam@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8a6d831adcc3edc23c751d6fe6f600765bcc37b2 X-VCS-Branch: master Date: Sat, 22 Jan 2022 18:51:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37bbd429-ac14-4cce-8ae6-fbe076fc95a7 X-Archives-Hash: 4b27f6eeec57c4a4fbd3bfb0cafc69a0 commit: 8a6d831adcc3edc23c751d6fe6f600765bcc37b2 Author: Sam James gentoo org> AuthorDate: Sat Jan 22 18:51:00 2022 +0000 Commit: Sam James gentoo 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 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 + 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