From nobody Thu May 07 17:25:09 2026 X-Original-To: dev-commits-src-all@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 4gBJzV0BZ3z6ct1f for ; Thu, 07 May 2026 17:25:10 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBJzT3kwGz3l92 for ; Thu, 07 May 2026 17:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174709; 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=kQy40CqxnZqhblxQTMqJAgrJgnck/TVEXASd3IKst88=; b=WF0JgyqcerFHF75kQODnEsyn/sR8vXVlI24XTFwmQP/dOKiWOCwRvJUQdDoig+O4ClibI7 ENmXf4sGq+VsRkWKTw7G7ouwqsubU7dJOPdMRX7iI/AV/IPo2OdhoK7BUVJGlcxr4PxgV/ LNHI0gAuV1s6dkhHHoFel0/t4w76XQ0JNuHRw4/c3qkxGRpPEZQm2SxzsfpcBi9VoxG9cJ fWQ8xVhTKgq48zSaXwknXv/cOGQUW63GMYYk9tR9cCNtzKzElllDux0iDuOX0a57u5/ocj jd05MBMAYXNTsC2mIXOmT9egoqOom8BxUeaRhvkLPa/beKWEdYgfUfD3mP0btA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778174709; a=rsa-sha256; cv=none; b=dk8cak0OTKVXq7sefCfpcGI6Qk6m5y5fs8cvX01qw+516y71M8O7R5UcYZh9SzNHKMG8rh R9kWMq7wlc/YDpUZdEJyT0cpZgwR4Lb3HRfs1gh4j9HKKMtlGGFX4Tj4aEvlW9x8TNWcNG qJwM+XnXBOmQ9+KCTkIEHN195BTcCqF3MgYEQNiNvYG+TGtrOzAIYuxMKCWV2bZ64uFZ0z 7HgVoNGhX5tixcr0homqPDy4UdHoRnFY0J2ch+yvKQGO5hUbpKzBSwFS0WPbOaOIx2lTBn q0/lSNoD6pPe0oPeOjGgKBxZALdNXa9EpFWV5eGB/ivK/cDUjWYp2BPgkPsRXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778174709; 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=kQy40CqxnZqhblxQTMqJAgrJgnck/TVEXASd3IKst88=; b=kdmnMORnyVNe9uxiDmk+iHuXoHkOEjdbcxGP0aoM7/Ou11rRFC0x0Q8S9+AwUz7ZN3eNmA 6V9oZStrCEQpxIe8XNijXoZMCGpiBdPan0yjjG7H94NE9gsdj3zwGz/xuB0a2jsBxq8FB2 5EtEMrxrHJtPDUqcze7y7LUeMRoSXshJxVvIkeb+rzdT43cTCN0GKDIGXN/Vqw/wDbGFUZ 3BvtwucCxnmAqcAwRW2IB6ePB3xQL2esj3UZQuJuUJ64U4ohIg8Fu3W1QR+8lXDwPFaHoN 5gyeGnG1ppq+YkJjdDu3jQU8kmCnf18GKHI39RhRgExx8IwjZVjQLHd5H0hxFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBJzT33fZzcQS for ; Thu, 07 May 2026 17:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b0f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 17:25:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 317817c9acaa - releng/15.1 - bsdinstall: Always use pkg.FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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.1 X-Git-Reftype: branch X-Git-Commit: 317817c9acaa63e439d748b645cc954e93c6cf88 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 17:25:09 +0000 Message-Id: <69fccaf5.3b0f0.210668ca@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=317817c9acaa63e439d748b645cc954e93c6cf88 commit 317817c9acaa63e439d748b645cc954e93c6cf88 Author: Colin Percival AuthorDate: 2026-05-05 02:43:59 +0000 Commit: Colin Percival CommitDate: 2026-05-07 17:23:23 +0000 bsdinstall: Always use pkg.FreeBSD.org The FreeBSD-base bits are accessible via pkg.FreeBSD.org, even for releases, so there is no need to point at pkgbase.FreeBSD.org. Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 89b97931d6d415d7a2504d8ea2c99beafd77cf24) (cherry picked from commit dcdc1af669999aa3182c39ef9f162b625593785f) --- usr.sbin/bsdinstall/FreeBSD-base.conf.in | 2 +- usr.sbin/bsdinstall/Makefile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bsdinstall/FreeBSD-base.conf.in b/usr.sbin/bsdinstall/FreeBSD-base.conf.in index 86ec8fabe253..13c94bbb8a64 100644 --- a/usr.sbin/bsdinstall/FreeBSD-base.conf.in +++ b/usr.sbin/bsdinstall/FreeBSD-base.conf.in @@ -1,5 +1,5 @@ FreeBSD-base: { - url: "pkg+https://%%PKGHOST%%.FreeBSD.org/${ABI}/%%SUBURL%%", + url: "pkg+https://pkg.FreeBSD.org/${ABI}/%%SUBURL%%", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/%%KEYSDIR%%", diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index a576f2d0794e..f796a8710c5b 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -21,26 +21,22 @@ _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION} .if ${BRANCH} == CURRENT || ${BRANCH} == STABLE -PKGHOST= pkg KEYSDIR= pkg SUBURL= base_latest .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|%%PKGHOST%%|${PKGHOST}|;s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} + sed "s|%%SUBURL%%|${SUBURL}|;s|%%KEYSDIR%%|${KEYSDIR}|" < ${.ALLSRC} > ${.TARGET} .include