Date: Thu, 14 May 2026 19:05:09 +0000 From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dave Cottlehuber <dch@FreeBSD.org> Subject: git: 5457f05b201f - releng/15.1 - release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf Message-ID: <6a061ce5.26732.4488118b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 commit 5457f05b201f6f5aa0bf9a8739096a3c0ac037d4 Author: Dave Cottlehuber <dch@FreeBSD.org> AuthorDate: 2026-01-27 22:51:22 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> 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 <<EOF + cat > $m/usr/local/etc/pkg/repos/FreeBSD.conf <<EOF FreeBSD-base: { - url: "https://pkg.FreeBSD.org/\${ABI}/${repo}", - mirror_type: "srv", - signature_type: "fingerprints", - fingerprints: "/usr/share/keys/pkg", enabled: yes } EOFhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a061ce5.26732.4488118b>