From nobody Sat Nov 15 07:58:57 2025 X-Original-To: dev-commits-src-main@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 4d7mc20jssz6HKlj; Sat, 15 Nov 2025 07:58:58 +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 4d7mc120f5z3NvN; Sat, 15 Nov 2025 07:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763193537; 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=VYDZEoiLT+2sglMdbgumbh8NFJ460/oEXXgsCJ7XXzw=; b=T+69pxNCLZG2KDLRoyFmBBSiJaPVT75y430mc+buBAb2xLHfUJzKRrYfsuFUYU7DkEMUe6 7IQbBdtU49gzkI1QyQOdoeyjwjTrC6nUXSHvILR07zpBuOQTpPOr6cuVbiLnr8ltHTZIKe w++y9li2y5leZHMZVilzVQ0jgNC4+hUIPUOdonYT2J2oBdaZn6leKiYU/HpuPPh5JvCjr0 9g2KIkvF3Zx0efBBJMV2aI+yGGeUI7srb1Kp2J10LEq3lmY16uXrroll9mbtC4tkcD0fYs KxEbH0Q3FVuVxoAXk+XZTxE+lRaF+jMDejBghLrogvCmgvqeOVnBE1KIAK5yWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763193537; 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=VYDZEoiLT+2sglMdbgumbh8NFJ460/oEXXgsCJ7XXzw=; b=jUNs9f2TXJXq8U1z7R9o1Ry6bHtxj+mQ2TwFtQnb5H7p/739Mg+NdNX86/vdG8BVkih+eH Vs1WsR/ksZxSX8DHrhmEdVvW0N5j6FYPxuPzBRkbub0tR1aiFxBe1l17fTYMgdjAWSKS88 yv4Jj+IMEaN+OI0Ouz+B6f21ZAto3xNBLiyfihvc72A0D5heFx/k1pTVZp5K+bj5IzZMTN xSe9AVmt/Uh3yO3VKMdpZyEu7yrHLPjhisdGnxmzcK9PynxiXY5Yx4tIoDc8cWJYFl6lbt oUqmmlIPifcFBXqrkEpx2yHJwbkhkuSgJEjbcU/E4lPLvelaWpCdM9deW4goEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763193537; a=rsa-sha256; cv=none; b=Oet5Rrd2l9maGCrRouh/M2EyJp1WFlT9aBlx9SdO5UQF2BdYeIUmoK3+9oqBIqhm7vWERB Zbp5RlU+ma4dki4Qs5KrInKUs82S/igWcLcXxlg37etdhsqEBK15vftgC7sqeonh1+bhPF xiJa4OgYsuKTWoKwbMlQUnbQTyk3dYc5UUPtOXAcBEpuUfdA7KLln6NXOKTrpNUjIVH/MG EDRgjoF20LFTtYKg57xqkOypak0bxg34xZ1oPCVoMRcVlUzxJbfLc47I0h/66oQCZQwrnf 9kIWuyrg5Uhn9yT+gKPP1xtWQK/T+LFyXoEDEnNvsachbBOwFp4Swy1TAbnXIw== 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 4d7mc1158zzkjl; Sat, 15 Nov 2025 07:58:57 +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 5AF7wvRJ013466; Sat, 15 Nov 2025 07:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF7wvGM013463; Sat, 15 Nov 2025 07:58:57 GMT (envelope-from git) Date: Sat, 15 Nov 2025 07:58:57 GMT Message-Id: <202511150758.5AF7wvGM013463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 51184e38c932 - main - bsdinstall: Use pkgbase.f.o for BETA/RC/RELEASE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 51184e38c932b7acedfc26fef3a0aad4c04f8959 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=51184e38c932b7acedfc26fef3a0aad4c04f8959 commit 51184e38c932b7acedfc26fef3a0aad4c04f8959 Author: Colin Percival AuthorDate: 2025-11-15 03:04:51 +0000 Commit: Colin Percival CommitDate: 2025-11-15 07:58:41 +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. With hat: re MFC after: 8 hours (needed in 15.0-RC1) --- 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