From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 90823138335 for ; Mon, 25 Mar 2019 14:20:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A752AE091A; Mon, 25 Mar 2019 14:20:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EA26E091A for ; Mon, 25 Mar 2019 14:20:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51E56335D5A for ; Mon, 25 Mar 2019 14:20:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74DF94B2 for ; Mon, 25 Mar 2019 14:20:19 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1553514830.f8c03c3512c1f2d2b9db7ac92fe02ee5df031dce.haubi@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: f8c03c3512c1f2d2b9db7ac92fe02ee5df031dce X-VCS-Branch: master Date: Mon, 25 Mar 2019 14:20:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0b8eeb7a-e7f8-409b-bae3-8ab49288fb8d X-Archives-Hash: 6f1a76639a18c68765068248cfd60ef1 commit: f8c03c3512c1f2d2b9db7ac92fe02ee5df031dce Author: Michael Haubenwallner gentoo org> AuthorDate: Mon Mar 25 11:31:18 2019 +0000 Commit: Michael Haubenwallner gentoo 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 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,