summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2019-03-25 12:31:18 +0100
committerMichael Haubenwallner <haubi@gentoo.org>2019-03-25 12:53:50 +0100
commitf8c03c3512c1f2d2b9db7ac92fe02ee5df031dce (patch)
tree9b3762e4e4ce474dbde82a7b86c5a49fe5a74778
parentdev-libs/openssl: sync (diff)
downloadprefix-f8c03c3512c1f2d2b9db7ac92fe02ee5df031dce.tar.gz
prefix-f8c03c3512c1f2d2b9db7ac92fe02ee5df031dce.tar.bz2
prefix-f8c03c3512c1f2d2b9db7ac92fe02ee5df031dce.zip
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@gentoo.org>
-rwxr-xr-xscripts/bootstrap-prefix.sh4
1 files changed, 3 insertions, 1 deletions
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,