From nobody Sun Nov 16 02:04:28 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 4d8DhX3yV9z6GjHj; Sun, 16 Nov 2025 02:04:28 +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 4d8DhX22FKz3cMg; Sun, 16 Nov 2025 02:04:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258668; 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=cQFvAAXHc66snMdEvkqql8I65jZln5ImNE0ghed8ELk=; b=R2MKDOvIE8OrLxnH9XW0OQ3tVSPrnnitFU2O2qdy15jWAaxTNbIVgJkLzZniNN3qNQ12zj 2OXwzlyAC+5d1J/7DBRpw/oolxOwQe69sWk2CkI/BAn02se4vSCbwh0wyqeodJOqXnLjWH kWPbrNSgiDnBNP8usYBDS3V36BG1H5PR6/upqQUjmLqxjrrq3yueH2d/LwX7KM+Lci9wyy 4p7pXtpC9vaqwtMenvr86RWo8fCWATaoIE78tNDG5lKjtYYk5aoxYxfNgG/u+4pmDhZ54j +f+242Kzyv9bshWhD6rMs81U9UMnhhQzS60xbD+cb6ePMBKc717a7u7cv/w4cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763258668; 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=cQFvAAXHc66snMdEvkqql8I65jZln5ImNE0ghed8ELk=; b=nr9KtCzjvdrY0+zt39nKgJdcuMB04FqL5pv6tkIYQ6vfuaCZaKw2Hcd/HpBifOgYeln+q2 GmyThWLSgOMqrV1pJLMD8FcMGbbDpl3QuTc5Fcn+70orFbXzplyiNSIzy2iSwHICYuEVez zcUKYB/2Qh0+v0doqYJLXFcNbRms4DPdTHqmM2FD7kA8IyGDNkeBSgsfjegEFXeyQVDNaq eVJDX6Z23Ry7UtUsMvpUjT2nniKjxt9kmZU0SvonHlU0b3ZA0O6Wz99oMLWJjhejVasCen kv8Bm+6a9kbmig743bpRKeCLTfx2dZhypMnxTChbufKc49CMqRXF9ded8EsglQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763258668; a=rsa-sha256; cv=none; b=p+D08bsmvzCQ8obp6DfWWGJpgTe+REsV4YaoHPQNQtulkPeLQrX6de49pn/CYCCBS0gxHs MmNmtywm5ouj6Md2srySlTu7DPzBJPrjW3iD49BqmqPtVIn/cWIcgr+josoO2GycCQ9XGu A4wzibRC2B9lfQgC2Oy9esQgwcYH6RxFp6MXnvl55SK/t/EcxSMJiQByUoOUJkBExeVdG0 bSMKCmoLYjVlqMTvBR5LbGJLLUQVbuvCzJ9GyoaBo91uVC0XB3s78u715ZMYe/76f0ab5v vlsaZlcXoETod7KOR3652GqbqTqJnLGwx9tdWFnbn5eRtgyCtnPgVu2Z+1jp3A== 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 4d8DhX1Mbdz3Y8; Sun, 16 Nov 2025 02:04:28 +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 5AG24SNU060804; Sun, 16 Nov 2025 02:04:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AG24SwW060801; Sun, 16 Nov 2025 02:04:28 GMT (envelope-from git) Date: Sun, 16 Nov 2025 02:04:28 GMT Message-Id: <202511160204.5AG24SwW060801@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: 2ce97e800393 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 2ce97e800393057e3b8f041993678cb8af2c7607 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2ce97e800393057e3b8f041993678cb8af2c7607 commit 2ce97e800393057e3b8f041993678cb8af2c7607 Author: Colin Percival AuthorDate: 2025-11-15 03:04:51 +0000 Commit: Colin Percival CommitDate: 2025-11-16 02:04:14 +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) (cherry picked from commit 51184e38c932b7acedfc26fef3a0aad4c04f8959) --- 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