From nobody Tue Oct 20 02:38:36 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 4j7xRw6G1Yz6w7Fw for ; Tue, 20 Oct 2026 02:38:36 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j7xRw5gLWz4vLc for ; Tue, 20 Oct 2026 02:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792463916; 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=9QoXMOLnio/vpSAjR4MMrFyPHmrtu34FFiThpNvd5hU=; b=K6nscedeW+OTnWBtypYKYBnP7wmhPPOuxzk7iysJIb1jD23dsYNZiUzOzafqepccCWECBX rVqYsFzVduag+le3h5k4PLqgDPIxpFVXT4YDX2qMdud/QakeHpOlUFS66bSdMvSjq1iLSt LsydzEWBCguzeL0T3NenDSGx2mYdvJtR74yM3Hp9WY7n6r0qN487iwcLPeQGOO2PMier6E GIfj/gjvMVN69cyOD8+pcP3iIMHSuStxRLrFnwIsTp9VQvrLpX6MUvV3z+iP4CPQaIOl3a FtIw4IBXFvog4MLMgijGvf0XeopUk+KY8rqw4o/oKf09iMU6C21uGvjErpsFHw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792463916; b=hGeXHc5oEKkQDJkpsxT4SQn/JDE4Lg29gPvVGMp46rSpGlrpzmewHu322E+OHnkmS3t/Gl oOa7FXxJP7sp5GGKYzNsnf1OoMZAFUPuMczpHXZmhBqdJ9+qIyZK6AxsQB5Mx9BmtSkDSI rtTKQ8+WJXJldL+NSq3N+KE6UmIfMIhnFk4uRlYoq3UqgS6xXO5g65ycJqSwCrmyUY6dRh 6H8wjFUPX0BsYI63lYbiBpe0EcopYQ/luR2T/ii3/s+UMcqeuUjT/PEd0NoE1lvF5aP7Ab E45gFDypGucjM19DZAlgPHOxX+/Bl5t1sGJY696aH6VycmlCtWLcXQwBnnwCDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792463916; 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=9QoXMOLnio/vpSAjR4MMrFyPHmrtu34FFiThpNvd5hU=; b=xQFWM3KKSh3a/nZnClcMywl0FKFYaMY36W22WonHdRt/RGNEkpO7CjfiUIhVZ0HvGx0iXt G1MjNVTxIzOnkfjE/Hkm2mAHsGHJ9VDSFsxPBmtgIV/Hyl1XyboTg7LcxrwCQJs4WCYToo SqeTBJ6D0zVJtJpl/d6KyUaWGTow2GsvOSUz5H0zgthQhAtxpZU5occUU75C7ZuLgTs2yw XWUMBbW2knZOEFQ5ZSMH8b3a3xKttpoypao/3sWmyjXUh1u+ocukvvRJdaua6wH6RF3Y9t ru3ua9Dn/TIBvaxR7ge1h4a7NPew4pJxvgw26rx6p31ZX0OsABxNBhPUjlH6Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j7xRw53f9zpbd for ; Tue, 20 Oct 2026 02:38:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4592a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Oct 2026 02:38:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 93c05b743ea8 - main - OCI: Remove dead code List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository 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: 93c05b743ea865bb87653e9ee5fbaa837c00eee7 Auto-Submitted: auto-generated Date: Tue, 20 Oct 2026 02:38:36 +0000 Message-Id: <6ad6d42c.4592a.4804684b@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=93c05b743ea865bb87653e9ee5fbaa837c00eee7 commit 93c05b743ea865bb87653e9ee5fbaa837c00eee7 Author: Colin Percival AuthorDate: 2026-10-19 17:17:16 +0000 Commit: Colin Percival CommitDate: 2026-10-20 02:38:28 +0000 OCI: Remove dead code We don't need to pick a repository URL when all we're doing is enabling one which was specified in /etc/pkg/. Reviewed by: dch, imp Fixes: c73ae6734899 ("release/tools: use same pkg settings ...") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D60868 --- release/tools/oci-image-static.conf | 8 -------- 1 file changed, 8 deletions(-) diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index e2231d951268..8d2d80744a19 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -27,14 +27,6 @@ oci_image_build() { UNTRUSTPATH=${srcdir}/secure/caroot/untrusted \ certctl -c rehash # Generate a suitable repo config for pkgbase - case ${branch} in - CURRENT|STABLE|BETA*) - repo=base_latest - ;; - *) - repo=base_release_${minor} - ;; - esac mkdir -p $m/usr/local/etc/pkg/repos cat > $m/usr/local/etc/pkg/repos/FreeBSD.conf <