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 A5D52158094 for ; Mon, 8 Aug 2022 10:49:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFF46E0BD2; Mon, 8 Aug 2022 10:49:10 +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 5802FE0BD2 for ; Mon, 8 Aug 2022 10:49:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DB745340E7E for ; Mon, 8 Aug 2022 10:49:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D156448 for ; Mon, 8 Aug 2022 10:49:07 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1659955701.436fc672b64e117fecc7e3ebccd82936d0dd5433.grobian@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: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 436fc672b64e117fecc7e3ebccd82936d0dd5433 X-VCS-Branch: master Date: Mon, 8 Aug 2022 10:49:07 +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: 92620e40-b64e-488e-a5b5-aa60fa05017d X-Archives-Hash: 08a5f042963d425b696ed569be03bbd3 commit: 436fc672b64e117fecc7e3ebccd82936d0dd5433 Author: Fabian Groffen gentoo org> AuthorDate: Mon Aug 8 10:48:21 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Aug 8 10:48:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=436fc672 scripts/bootstrap-prefix: do NOT pull in baselayout-prefix baselayout-prefix is last-rited, and replaced by plain baselayout Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index e05ad93720..0635887745 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -503,11 +503,6 @@ bootstrap_setup() { einfo "Your profile is set to ${fullprofile}." fi - is-rap && cat >> "${ROOT}"/etc/portage/make.profile/make.defaults <<-'EOF' - # For baselayout-prefix in stage2 only. - ACCEPT_KEYWORDS="~${ARCH}-linux" - EOF - # bug #788613 avoid gcc-11 during stage 2/3 prior sync/emerge -e is-rap && cat >> "${ROOT}"/etc/portage/make.profile/package.mask <<-EOF # during bootstrap mask, bug #788613 @@ -1886,7 +1881,7 @@ bootstrap_stage2() { app-shells/bash app-arch/xz-utils sys-apps/sed - sys-apps/baselayout-prefix + sys-apps/baselayout dev-libs/libffi sys-devel/m4 sys-devel/flex @@ -2156,7 +2151,7 @@ bootstrap_stage3() { app-portage/elt-patches app-arch/xz-utils sys-apps/sed - sys-apps/baselayout-prefix + sys-apps/baselayout sys-devel/m4 sys-devel/flex sys-devel/binutils-config