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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5DB601581D3 for ; Tue, 28 May 2024 19:02:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CC45E2A01; Tue, 28 May 2024 19:02:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6DB9EE2A01 for ; Tue, 28 May 2024 19:02:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68C4233BED4 for ; Tue, 28 May 2024 19:02:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04CD1149C for ; Tue, 28 May 2024 19:02:27 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1716866465.7032312c7616e5d19a62ada3b0bf594035bc984c.grobian@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: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 7032312c7616e5d19a62ada3b0bf594035bc984c X-VCS-Branch: master Date: Tue, 28 May 2024 19:02:27 +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: 128eff1a-c619-4354-9857-3a8910d7ffdb X-Archives-Hash: cb80d3df2b8f668940a4679fcf60afb2 commit: 7032312c7616e5d19a62ada3b0bf594035bc984c Author: Fabian Groffen gentoo org> AuthorDate: Tue May 28 03:21:05 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue May 28 03:21:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7032312c scripts/bootstrap-prefix: attempt to fix b736fab6 do_emerge_pkgs Use ROOT, which should be the same between stages, such that we don't reference tmp/tmp. Thanks huxnu for pointing out. Bug: https://bugs.gentoo.org/933079 Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 4d4202945a..60f5a24347 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1785,16 +1785,20 @@ do_emerge_pkgs() { && export CFLAGS="${OVERRIDE_CFLAGS}" [[ -n ${OVERRIDE_CXXFLAGS} ]] \ && export CXXFLAGS="${OVERRIDE_CXXFLAGS}" - # In the stage3 bootstrap we always prefer to use tools that have been built for - # stage3; to accomplish this we ensure that it is the first thing evaluated in PATH. - # Unfortunately, Portage, Python, and Python-exec are often pulled into the depgraph - # at some point before we're fully boostrapped. To ensure that we don't try and execute - # ${EPREFIX}/usr/bin/emerge before we're ready, always provide the full path to the - # bootstrap Python interpreter and emerge script. + # In the stage3 bootstrap we always prefer to use tools that + # have been built for stage3; to accomplish this we ensure + # that it is the first thing evaluated in PATH. + # Unfortunately, Portage, Python, and Python-exec are often + # pulled into the depgraph at some point before we're fully + # boostrapped. To ensure that we don't try and execute + # ${EPREFIX}/usr/bin/emerge before we're ready, always + # provide the full path to the bootstrap Python interpreter + # and emerge script. PORTAGE_SYNC_STALE=0 \ FEATURES="-news ${FEATURES}" \ USE="${myuse[*]}" \ - "${EPREFIX}"/tmp/bin/python "${EPREFIX}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}" + "${ROOT}"/tmp/bin/python \ + "${ROOT}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}" ) || return 1 done }