commit: 436fc672b64e117fecc7e3ebccd82936d0dd5433
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 8 10:48:21 2022 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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
