From nobody Thu May 14 19:05: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 4gGfsf2Hdlz5WrTc for ; Thu, 14 May 2026 19:05: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 4gGfsf0FRBz47Kt for ; Thu, 14 May 2026 19:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778785510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptj2KUnI1m9z6rQ1DfxFdUO0EramDQSMZwHZTByhCDM=; b=V29vhE0H97wJpdkL3doyw7740sKMxDVbWaj2iuUWgK2XUcWYrBZFa5HhfSaPex9cOS+1XN BObnQYMyah8AMkZ/TLORzT8qm68DCY6V+8EayZ8BWFPfGJImwQpUYAXgoFINO1QLHc6myb HQuhmohg/43dqZfHEK4+yWbjQLZCLdqiRh494ZouMka39XWIDW0EJRVnM7zAipf0IsWgGQ QMmKcN/tMwDciGxeweBCHaihoW/u6LUqMURZt0UObbsHdFiwwSR9xTsVyJ7lG0krnDLMSn 3RukeQgAOE7Jof21oiBPYAmmTVxjH+eorIOFUCofPGYnUe5/Nk7NRh/UJ2I/Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778785510; a=rsa-sha256; cv=none; b=Jkh8gBC1pwMq1rml+bd+9hGA0lwRe3lMfs/6NJhTivMvjGyErL9kpMWjAgvRep12h5/F76 AwV6xjaR/ocjo58GAmJoqFiVdwC5XpBC/AsyqJLyI/Hh/nIM9ORegKp32KwP0+icohquG1 sANfcDPHZH5r8URV2TfqEPVxu2/tlgAyrlUf3A+kOuAR5rMUXG8nhRthzz5vqyjqDN2OIL zaknPTOfTkjM4b+zAviB+SFjW62NqQs3sI7RHY9JeOAyQoumSev09sE0EwGz7C5xjXPkyb ac1kwtJjx63BtTUSVdj6yek5VWAU5a+CKKTUqZBkGDN2T/50YkVR/rug5gQk5g== 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=1778785510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptj2KUnI1m9z6rQ1DfxFdUO0EramDQSMZwHZTByhCDM=; b=k8cDpCXWNJwrVADRiSWXikqacqyHABrImlcu+7AVWL2y+tQGRnd53vgDAtpytaKy2sCI0J 4JZlnOu3dAFpA8TSH+PTbTi5GowUg2dSOikeRwYCoOgQWUTIaTMSSB1TXzSIOK1M+wAe9P 8kc4iSmJA8jITHJdcHA92Q4okf5RRpvrSo/wJgFeBkGGamii11c2Fuey1gazOlo7uVq8XN HaDdiOqERio675o5RPEikiuj1bArp6qVO58gYtwQxVGOpplEGRXFDHh/M55SPZ4SIo/Qmo Cx7XG9fmW+E0V5b5lZy5m2ECyrnzgpv6QjZHVkv6aKTH00JcBhSjfkEpuLNaVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGfsd6jFhzqYB for ; Thu, 14 May 2026 19:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26732 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 19:05:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dave Cottlehuber From: Colin Percival Subject: git: 5457f05b201f - releng/15.1 - release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf 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: 5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 19:05:09 +0000 Message-Id: <6a061ce5.26732.4488118b@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 commit 5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 Author: Dave Cottlehuber AuthorDate: 2026-01-27 22:51:22 +0000 Commit: Colin Percival CommitDate: 2026-05-14 19:04:23 +0000 release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf Instructions in /etc/pkg/FreeBSD.conf and elsewhere recommend putting changes in /usr/local/etc/pkg/repos/FreeBSD.conf so bring OCI containers into line as well. Reviewed by: dfr, ivy Differential Revision: https://reviews.freebsd.org/D54090 Approved by: re (cperciva) MFC after: 5 days Sponsored by: SkunkWerks, GmbH (cherry picked from commit c73ae67348998a0056145e88debbea9ff6860c4f) (cherry picked from commit d889f6c466d4cec73c34bc71093d08b25e321071) --- release/tools/oci-image-static.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index 8e642d9defce..e2231d951268 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -36,12 +36,8 @@ oci_image_build() { ;; esac mkdir -p $m/usr/local/etc/pkg/repos - cat > $m/usr/local/etc/pkg/repos/base.conf < $m/usr/local/etc/pkg/repos/FreeBSD.conf <