From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1351895-garchives=archives.gentoo.org@lists.gentoo.org>
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 04013158086
for <garchives@archives.gentoo.org>; Wed, 22 Dec 2021 23:58:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 262CC2BC002;
Wed, 22 Dec 2021 23:58:11 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 680452BC001
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Dec 2021 23:58:08 +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 4B075342F34
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Dec 2021 23:58:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A2641D0
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Dec 2021 23:58:05 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1640217399.f1ba8d24da137ddcd0d0ba6c68d1f5e4b37635ef.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: f1ba8d24da137ddcd0d0ba6c68d1f5e4b37635ef
X-VCS-Branch: master
Date: Wed, 22 Dec 2021 23:58:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 69ab0f6a-a509-466a-9cd9-f2d7de09e9c0
X-Archives-Hash: 1e62a43da3f56539b3867ec9ed948784
commit: f1ba8d24da137ddcd0d0ba6c68d1f5e4b37635ef
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 23:55:44 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 23:56:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f1ba8d24
scripts/bootstrap-prefix.sh: mask glibc-2.34 due to bootstrapping issues
Mask <sys-libs/glibc-2.34_p1 for now due to bootstrapping issues. Note that
_p1 doesn't exist but I wanted to use _something_ to allow us to push
glibc-2.34 to prefix users in future and _p1 is easier than guessing a revision.
We rarely use _pN in ::gentoo.
Bug: https://bugs.gentoo.org/824482
Signed-off-by: Sam James <sam <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index ccbe9ef905..15ae679b95 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -494,6 +494,18 @@ bootstrap_setup() {
>=sys-devel/gcc-11
EOF
+ # bug #824482 avoid glibc-2.34
+ if is-rap; then
+ if ! [ -d "${ROOT}"/etc/portage/package.mask ]; then
+ mkdir "${ROOT}"/etc/portage/package.mask
+ 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
+ EOF
+ fi
+
# Use package.use to disable in the portage tree to be shared between
# stage2 and stage3. The hack will be undone during tree sync in stage3.
cat >> "${ROOT}"/etc/portage/make.profile/package.use <<-EOF