From nobody Tue Oct 27 02:31:53 2026 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 4jDDyx3xysz6wMmx for ; Tue, 27 Oct 2026 02:31:53 +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 4jDDyx3Fldz3JPv for ; Tue, 27 Oct 2026 02:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793068313; 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=P/OJotYNhRCpgBgsMBhY1Z7JGB8J35hksiVz5cyOLaI=; b=wkY3W473VJhSNJE0Iy9NXv4VqO/MQdodUc3L/4KqfnuknMR9CQ5uANJYzy422/Pv93bIAr +1hF53DfsqTf8q80xFs/KL0QOtRHXgMj3j2s77zoio5ZB0qX93J6ol/wO4ze7dRR7Sqquv JQcKbllvbc01CFyL4ePoTOVdJywUbMsnAxQigR8HJuvi6A3tIKl4UNJJgF8lGMqVbXjMN9 wUTMqN4bee2AAJY8DDgWmcxxzk0MhBCDFxeAvDOusxRbsyOmvdkiZE39nfnUrS0n3xN+sY MuFS2PN95OJFr8R0wPv3HHVF9RN8R0ZrLcZ0JDOnmGNqay2uIKtbOHbwP0X50Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793068313; b=ZbYwCcIA5gSUeUEuPfxN2gPMr64P53tpV1TUQNjFp8lwhJUxa8dZPOQkUXkLnOYxQZjF9B VQanMsA60KQQ/VXA+JAapzU7/DQu432FKJntGT9PYRIpCmSQ4Aojn4DeuOchrCmk6eLU2b +R6ut5EiI1ePPTR0JJnzFA+YufNrPV0a+gn26Ch6mV4cyArYGwLMmkLQVvTh5xhSetXIO6 hJ+3QV8/0U5CcoJ+N87xH0awrSCGJ5zzm75TS/v/WlhB20VrCIT7iHc1tr8pGSAp0wpGoK b66X3lkQJJnFdjp6602LdIBtPFr56MahcAZvWPLohR04zOI8hV8n66YELAK9xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793068313; 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=P/OJotYNhRCpgBgsMBhY1Z7JGB8J35hksiVz5cyOLaI=; b=RXgfG1FCbnVcGt64AHD6gAo0zVfLusI5XDq03u4RhXVmzqn1Bk+UVVD4pCr0+Gp9SDscJT Rxsj8oYMF0NoL7JKcLtrhPa0nqgKwS3AlYCkEpVDKIfr/nXS5kP9x130dwbAKCV+Oljez7 A+OaSVYmjGVjRPL0uM/4T/HFb0ExG99szjPDfn9j0Byrifht3oHZaRbFCWlCFaYFdb5/Rf ksewQZbI1BVRl7k/66uiYCdMdWSXH3CxY5GAeYpoJ4YXT6fCin9LwdvmRZVuXyDQBEK4Xy QjyDjci+K7kLRKzvR6pShWjHtZHuto/jQ6o5+GiRY97ZQRgmw4O/yAUcvE1VPQ== 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 4jDDyx2vsrz11fT for ; Tue, 27 Oct 2026 02:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3de81 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Oct 2026 02:31:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9154ea3a95bb - stable/15 - OCI: Remove dead code List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9154ea3a95bb57c374db53c7302f928491aaff25 Auto-Submitted: auto-generated Date: Tue, 27 Oct 2026 02:31:53 +0000 Message-Id: <6ae00d19.3de81.2cf53013@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9154ea3a95bb57c374db53c7302f928491aaff25 commit 9154ea3a95bb57c374db53c7302f928491aaff25 Author: Colin Percival AuthorDate: 2026-10-19 17:17:16 +0000 Commit: Colin Percival CommitDate: 2026-10-27 02:31:49 +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 (cherry picked from commit 93c05b743ea865bb87653e9ee5fbaa837c00eee7) --- 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 <