From nobody Sun Nov 16 03:11:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d8GBR0JBrz6GqGC; Sun, 16 Nov 2025 03:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8GBQ59Hsz3n6C; Sun, 16 Nov 2025 03:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pp4WTz8bGSgTmvPgs4DxNkMfuSVQTTIKtLYnoIhwtdU=; b=Mqv9cO5x857XWru2Y+jVqyFj0XnIhpDlUkwvOYwSuWub+gRiLgrnGo5fXI1f1MkcmsHNEl +510rjeCtBYg3csgU6v7nwkzZd8uEOFEDxlQNQMPquVtLpDM1ifncKiNZvvaZ86/GD4Dip vKEdlMOKgsRAXqso/o/v0p2joGRYEPfs6O4YBrPv8ERCteTJiIqpL56b13+4Ibj3w/7sMZ iV60D7X3dRBI6hrqxOveXJAjd47pV6/fAprk8/guG2P25qogC9CuOJa4I/1L1swauSyPr7 2OLugFiflXz7tyqKTovb/perYXdDez1678PqixG/KZYSTn0ptVqstPCzQu8ZJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763262718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pp4WTz8bGSgTmvPgs4DxNkMfuSVQTTIKtLYnoIhwtdU=; b=QKP2eKJP7btRqxRv5SmSVIuU36ZQJF1oLRlm/OtaYkJIMRXygbh6nRold5EIPIhtRIS0gB Wv5kNgs0IlkFtol3hC9iDlrrsCYpcg4UImhQLJuM3LqPuxi6V2HbLWwQtFO9ReZEdTkITb PXJBCHGLDahlaG3mewCLsA/nqHlgJac1wmS9TlEqkrLTthA0IWjAd2aZUQ5RGnpc3FxHzJ H21YKMytvWyKKfh+MUXv9UBMu82EXZbFhbnup8eghneCIu31zdTHf4mJM6mLFjN9Z/crhV pTqDVd8ehT39ofaAFN1vKdkBWmF8ZT8WqODRe6U2M1I86X4bmGFDZu1kzGgT9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763262718; a=rsa-sha256; cv=none; b=Br29V9cxeQUvZYZNyxvPbMUliXs5TKQ14F5hSHUmPEUwWi6C9pEMytMNxrBVmoD0TtEtez X4r8YI/g6v8+Fj6xuRw3xnl7fTZVkbT8UyHvyv05wbWZ0m055xWXxkRQ+/lViZ6NLW6OZA /c58rumbGUzVTZZ92Z0reHRTAtFT/ovZ6JsYMxfSyL621aGfu91iU6oD0AJ6gOw+NvJDLZ Feg1KdLBWtnDr/H+b+CEv1GYFtSlquHFeqXTeKR/R9Av2tMs4qc/JHgMvQQFcjH+IJgsCT HK3hLl4SP3g2earRcsfLRSPAFnJ24pjVuJv+lGirNrM1MJ4GO7etjd+PpBYvrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d8GBQ481dz5bP; Sun, 16 Nov 2025 03:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AG3BwmW091520; Sun, 16 Nov 2025 03:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG3BwFo091517; Sun, 16 Nov 2025 03:11:58 GMT (envelope-from git) Date: Sun, 16 Nov 2025 03:11:58 GMT Message-Id: <202511160311.5AG3BwFo091517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f8526558890c - releng/15.0 - bsdinstall: Use pkgbase.f.o for BETA/RC/RELEASE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f8526558890c201f5a2c3959112db3f0036de385 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f8526558890c201f5a2c3959112db3f0036de385 commit f8526558890c201f5a2c3959112db3f0036de385 Author: Colin Percival AuthorDate: 2025-11-15 03:04:51 +0000 Commit: Colin Percival CommitDate: 2025-11-16 03:10:54 +0000 bsdinstall: Use pkgbase.f.o for BETA/RC/RELEASE For BETA/RC/RELEASE builds, fetch files from the appropriate repository on pkgbase.freebsd.org, using the appropriate signing keys. Note that there is a separate repository for each BETA and RC; this ensures that someone installing from e.g. a 15.0-RC1 ISO will get 15.0-RC1 bits and not whatever happens to be the most recent build from releng/15.0. Approved by: re (cperciva) With hat: re MFC after: 8 hours (needed in 15.0-RC1) (cherry picked from commit 51184e38c932b7acedfc26fef3a0aad4c04f8959) (cherry picked from commit 2ce97e800393057e3b8f041993678cb8af2c7607) --- usr.sbin/bsdinstall/FreeBSD-base.conf.in | 4 ++-- usr.sbin/bsdinstall/Makefile | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in index 792c290facdf..86ec8fabe253 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in @@ -1,7 +1,7 @@ FreeBSD-base: { - url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%", + url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", mirror_type: "srv", signature_type: "fingerprints", - fingerprints: "/usr/share/keys/pkg", + fingerprints: "/usr/share/keys/%%KEYSDIR%%", enabled: yes } diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index 5d7be97ed7cf..9a6b25fc5c7a 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -21,16 +21,26 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE +PKGHOST= pkg +KEYSDIR= pkg SUBURL= base_latest -.elif ${BRANCH} == RELEASE || ${BRANCH:C/[0-9]+$//} == BETA || \ - ${BRANCH:C/[0-9]+$//} == RC +.elif ${BRANCH} == RELEASE +PKGHOST= pkgbase +KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} SUBURL= base_release_${REVISION:C/[0-9]+\.//} +.elif ${BRANCH:C/[0-9]+$//} == BETA || \ + ${BRANCH:C/[0-9]+$//} == RC +PKGHOST= pkgbase +KEYSDIR= pkgbase-${REVISION:C/\.[0-9]+//} +SUBURL= base_release_${REVISION:C/[0-9]+\.//}_${BRANCH:tl} .else .warning Invalid branch "${BRANCH}" +PKGHOST= pkg +KEYSDIR= pkg SUBURL= base_latest .endif FreeBSD-base.conf: FreeBSD-base.conf.in - sed "s|%%SUBURL%%|${SUBURL}|" < ${.ALLSRC} > ${.TARGET} + sed "s|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} .include