From nobody Tue May 5 04:21:51 2026 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 4g8lhc17t7z6dBsP for ; Tue, 05 May 2026 04:21:52 +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 4g8lhb6jW6z3Gc7 for ; Tue, 05 May 2026 04:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777954911; 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=M32RaCLva6dzgELnJ17K0C5nyLufvKf6e1cIlb9Uc2Q=; b=qZnZtzOf5YMeleT2oD1rytM+u75aLgeaVe9s7mTzP6LzOJOZlKuBpTKzrmDe4GQfTRfxp0 7E2OHSBYoeKDda5bWjjbil6AUNIcmAuv6nNPfGmMJ1QOYZMqI4anVdZVAGRB1hD9tG9zaQ RbXtD6pz2kepubHU4/4WSyggQ7aTFPd9WWud0qSrc1xzAJlDAXgkvOGPmg3A+NFBAfh3dJ +veAw4nRn1xoNpBMxI6WsKWcke2UJumvZLWS31MPvdyHnoYx1PKrpcshZpgOqEbsCPJS5T r1l48ItHyFUrH5mTTLeQxp1H59nPGSWwEcjM/qjW95uNpKDUdI0O+1b0cB5/cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777954911; a=rsa-sha256; cv=none; b=qhPvckgrsmTLq+5MCjDod6B3StdM08J/y8d+y4uKbRIFuPBi/U98/5y+RX+ZxVCjA/cAZp Wj6WqCug8nWZpAhYS8IzkPh3cjdGrmZUa797wwL+XF+x9pbdYCWhGAnghfzjXyT7eC6hZW 7Hdj/Iwz4O28E1yc67USu1gm7bOcGj5rDs4c5JKZbUeAwaa1c8mXRV5qLTYnNlj9eUSavr byBwqWqc57qkXRi9KUnpRrrrlYJxi4wGwCrKNlb+WM93NikyWGEO0s+ccfK6fqhFQt8o/y XBECc+r/iu6xi1gntw/FMBofRmFR+44AsxCY+KJDpMkeOokmna865ruuIMz2pQ== 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=1777954911; 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=M32RaCLva6dzgELnJ17K0C5nyLufvKf6e1cIlb9Uc2Q=; b=VG8uTqHZjUz2ncpaFenO3Q2zZKgT9hLTuMEC/YGOCkboup3EBXbgh8CTBemuvOFrBBDSv2 rMBNW2nHMv5f18s0ZZlE6jVWQtc8VQkxMCv1+gYblJMl5TW/xcOWuhgUmxWs73HVrzbRuy d+vo5sPdr0maeaXdFXjW6ONmheIeSG2PsdoJu6l5g6mrs14FbYC8q5tkMS8wyrMc0xnh2U xMzsI+45eoKkr1+qb31spDjiokwY+xnAsNdGjgzd/YaVqQ4ArpnMPU4Dry462FExvqlI7S xe8/+GDCnpRKtqW3ARaBAIPpC7VpiJbebKCVWvxSQMXqK05IlotlMtYBCjgiBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g8lhb5zrYzrmT for ; Tue, 05 May 2026 04:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3096a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 05 May 2026 04:21:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 89b97931d6d4 - main - bsdinstall: Always use pkg.FreeBSD.org 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 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/main X-Git-Reftype: branch X-Git-Commit: 89b97931d6d415d7a2504d8ea2c99beafd77cf24 Auto-Submitted: auto-generated Date: Tue, 05 May 2026 04:21:51 +0000 Message-Id: <69f9705f.3096a.42ac7292@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=89b97931d6d415d7a2504d8ea2c99beafd77cf24 commit 89b97931d6d415d7a2504d8ea2c99beafd77cf24 Author: Colin Percival AuthorDate: 2026-05-05 02:43:59 +0000 Commit: Colin Percival CommitDate: 2026-05-05 04:21:27 +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. MFC after: 3 days --- 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