commit: 9ff91cd60df019c1b008bdafcd32aac9e5811d5f
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 22 13:41:30 2018 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 22 13:44:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9ff91cd6
bootstrap-prefix.sh: only tmp portage really needs the stacked-prefix patch
There is no need to put it into etc/portage/patches/sys-apps/portage/,
because when portage itself is merged in stage3, everything's there.
scripts/bootstrap-prefix.sh | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5440b54289..046a7918d0 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -628,8 +628,7 @@ bootstrap_portage() {
cd "${S}"
# patch temporary included here: fail when it should be dropped
- mkdir -p "${ROOT}"/etc/portage/patches/sys-apps/portage || return 1
- cat >
"${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch
<<'EOP'
+ patch -p1 <<'EOP'
From 902fad63990eb4516d3e3815994b2dcbd16155fd Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner <ha...@gentoo.org>
Date: Tue, 19 Jun 2018 16:39:12 +0200
@@ -691,7 +690,6 @@ index a3d927c3b..ed54425b5 100644
EOP
[[ $? -eq 0 ]] || return 1
- patch -p1 <
"${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch
|| return 1
# >=2.3
[[ -r bin/repoman ]] || sed -i -e '/repoman/d' {man,bin}/Makefile.in
@@ -1876,9 +1874,6 @@ bootstrap_stage3() {
USE="ssl" \
emerge_pkgs "" "${pkgs[@]}" || return 1
- # patch temporary included here: fail when it should be dropped
- rm
"${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch
|| return 1
-
# Switch to the proper portage.
hash -r
