| 1 |
commit: 436fc672b64e117fecc7e3ebccd82936d0dd5433 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 8 10:48:21 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 8 10:48:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=436fc672 |
| 7 |
|
| 8 |
scripts/bootstrap-prefix: do NOT pull in baselayout-prefix |
| 9 |
|
| 10 |
baselayout-prefix is last-rited, and replaced by plain baselayout |
| 11 |
|
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
scripts/bootstrap-prefix.sh | 9 ++------- |
| 15 |
1 file changed, 2 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 18 |
index e05ad93720..0635887745 100755 |
| 19 |
--- a/scripts/bootstrap-prefix.sh |
| 20 |
+++ b/scripts/bootstrap-prefix.sh |
| 21 |
@@ -503,11 +503,6 @@ bootstrap_setup() { |
| 22 |
einfo "Your profile is set to ${fullprofile}." |
| 23 |
fi |
| 24 |
|
| 25 |
- is-rap && cat >> "${ROOT}"/etc/portage/make.profile/make.defaults <<-'EOF' |
| 26 |
- # For baselayout-prefix in stage2 only. |
| 27 |
- ACCEPT_KEYWORDS="~${ARCH}-linux" |
| 28 |
- EOF |
| 29 |
- |
| 30 |
# bug #788613 avoid gcc-11 during stage 2/3 prior sync/emerge -e |
| 31 |
is-rap && cat >> "${ROOT}"/etc/portage/make.profile/package.mask <<-EOF |
| 32 |
# during bootstrap mask, bug #788613 |
| 33 |
@@ -1886,7 +1881,7 @@ bootstrap_stage2() { |
| 34 |
app-shells/bash |
| 35 |
app-arch/xz-utils |
| 36 |
sys-apps/sed |
| 37 |
- sys-apps/baselayout-prefix |
| 38 |
+ sys-apps/baselayout |
| 39 |
dev-libs/libffi |
| 40 |
sys-devel/m4 |
| 41 |
sys-devel/flex |
| 42 |
@@ -2156,7 +2151,7 @@ bootstrap_stage3() { |
| 43 |
app-portage/elt-patches |
| 44 |
app-arch/xz-utils |
| 45 |
sys-apps/sed |
| 46 |
- sys-apps/baselayout-prefix |
| 47 |
+ sys-apps/baselayout |
| 48 |
sys-devel/m4 |
| 49 |
sys-devel/flex |
| 50 |
sys-devel/binutils-config |
Archives