commit: 550477e81aeb878d4f28cf2095a3be8e2f21c995 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Aug 31 06:25:46 2023 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu Aug 31 06:28:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=550477e8
scripts/bootstrap-prefix: ensure RAP pulls tree snapshot from gentoo mirrors prefix redirection mirror might use local (prefix) copies, which means portage-latest.tar.bz2 might come from an old (cached) archive. Ensure RAP uses gentoo mirrors for the snapshot instead. While at it, just use prefix mirrors for the snapshots instead of dev.gentoo.org. Saves a copy step and makes it easier to bump the snapshot. Bug: https://bugs.gentoo.org/913349 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> scripts/bootstrap-prefix.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index f2a24a137a..8e5d6e8b6e 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -561,14 +561,15 @@ do_tree() { } bootstrap_tree() { + local PV="20230709" + # RAP uses the latest gentoo main repo snapshot to bootstrap. is-rap && LATEST_TREE_YES=1 - local PV="20230709" - if [[ -n ${LATEST_TREE_YES} ]]; then - do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2 - else - do_tree http://dev.gentoo.org/~grobian/distfiles prefix-overlay-${PV}.tar.bz2 - fi + + [[ -n ${LATEST_TREE_YES} ]] && PV=latest + + do_tree "${SNAPSHOT_URL}" portage-${PV}.tar.bz2 + local ret=$? if [[ -n ${TREE_FROM_SRC} ]]; then estatus "stage1: rsyncing Portage tree" @@ -2247,7 +2248,7 @@ set_helper_vars() { DISTFILES_G_O="http://distfiles.prefix.bitzolder.nl"; DISTFILES_PFX="http://distfiles.prefix.bitzolder.nl/prefix"; GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"} - SNAPSHOT_HOST=$(rapx ${DISTFILES_G_O} http://rsync.prefix.bitzolder.nl) + SNAPSHOT_HOST=$(rapx http://distfiles.gentoo.org http://rsync.prefix.bitzolder.nl) SNAPSHOT_URL=${SNAPSHOT_URL:-"${SNAPSHOT_HOST}/snapshots"} GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other";
