From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1550857-garchives=archives.gentoo.org@lists.gentoo.org>
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 520E415800A
for <garchives@archives.gentoo.org>; Thu, 31 Aug 2023 06:28:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 80BF52BC016;
Thu, 31 Aug 2023 06:28:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 pigeon.gentoo.org (Postfix) with ESMTPS id 5FC7B2BC016
for <gentoo-commits@lists.gentoo.org>; Thu, 31 Aug 2023 06:28:49 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 56C5E340942
for <gentoo-commits@lists.gentoo.org>; Thu, 31 Aug 2023 06:28:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B91EAEF4
for <gentoo-commits@lists.gentoo.org>; Thu, 31 Aug 2023 06:28:46 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
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" <grobian@gentoo.org>
Message-ID: <1693463295.550477e81aeb878d4f28cf2095a3be8e2f21c995.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: 550477e81aeb878d4f28cf2095a3be8e2f21c995
X-VCS-Branch: master
Date: Thu, 31 Aug 2023 06:28:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a290a480-957b-4c3a-a182-3124e77878be
X-Archives-Hash: ed111b74738872967fe7328ede2b747a
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"