commit: f8c03c3512c1f2d2b9db7ac92fe02ee5df031dce Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> AuthorDate: Mon Mar 25 11:31:18 2019 +0000 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> CommitDate: Mon Mar 25 11:53:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f8c03c35
bootstrap-prefix.sh: set USE=prefix-stack Keep FEATURES=stacked-prefix until we bumped stage1 portage as well. Bug: https://bugs.gentoo.org/658572 Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> scripts/bootstrap-prefix.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index c91f6393e4..94040d941d 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1802,7 +1802,9 @@ bootstrap_stage3() { } with_stack_emerge_pkgs() { + # keep FEATURES=stacked-prefix until we bump portage in stage1 FEATURES="${FEATURES} stacked-prefix" \ + USE="${USE} prefix-stack" \ PORTAGE_OVERRIDE_EPREFIX="${ROOT}/tmp" \ emerge_pkgs "$@" } @@ -1976,7 +1978,7 @@ bootstrap_stage3() { ) # Bug 655414, 676096. - # Enough packages emerged using stacked-prefix with tmp/ as base prefix + # Enough packages emerged with USE=prefix-stack with tmp/ as base prefix # to allow for sys-apps/portage itself and dependencies without any # dependency into tmp/ now. # Portage does search it's global config using PORTAGE_OVERRIDE_EPREFIX,
