From nobody Mon Nov 02 02:16:46 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 4jHwLl2Kjyz6yRH9 for ; Mon, 02 Nov 2026 02:16:47 +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 4jHwLk5wP3z4LPZ for ; Mon, 02 Nov 2026 02:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793585806; 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=gniktAv9AWAeJIBbfHcTVow2NdgwiDZmJ+58yHuRxBQ=; b=AAuWWpbth0mlhsvBnI93VjOmaMRYxH/zftRagGw9thcY73MxZ0yUSnJQ7qJUg7YuUeaCkP UQbUXryMvwbbXBbcYHvZRtEeTIvmfRj1agADScY8K1rfnujTQv8l7umauUH5we+vgkXYFz 6XD8M/00HlaIkpnRiz+s6hUlYEaOppCCSaepkr/7Jbh3gzLmNdhsLmLBR1DbZk0UrTtRNY sMCgy3uRhK5Emk013yD+o/Oa40/ho6ZhyXph+mWP/YkWjyD7tE8hykbLqoLfH0gi9eFxce aSiMlLb0kYVj3e5Mbrexak583Rd5UNOn115iO9EvygROUuUOjwGOPm2uJgnJ0Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793585806; b=ifp390qdo69yqhcbClj2L2E5ise36UBnOOIFRBiIuVcQKaq599LOQO3AeHpNsGjaf2JvQL yW4Ow90INtCnySu2Forvwwtq63xesmFXGEEzesnlnNoqhBqa0YneenOdiOvJXNHAx/dZ8g pGgUGhds13gSaJupKrpVDB/XYWzsS9GI2xGSV2tVzYAtTg3bTAoJHduj8U9HUSVmzwK9C/ /fCLVzgE8DK82n9xlI750R+aOyoqzxu/owrnFO9UNdSqyvkfywNuAXyn53qdPlcQ8HM1nM EFIdZhoAzjCJBeEMIVMLtGkXLTYhyGvy8whkv7Q4XZrS5xOCbUa6Q+T0+RTuoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793585806; 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=gniktAv9AWAeJIBbfHcTVow2NdgwiDZmJ+58yHuRxBQ=; b=yPovUbDGdjFRKVyqkSIpnYISuDtiTcjedeER0dGNon1x/UX4IYhiiS0UtOsp1Y2uSlyNOo NFpkg+P5uZDKeuCIDIJxnlwJcsEAEk48smwbk96s7RX6VsnxmxbXOm8wARzHK4vmbg6lVS cXIsbPbnTggXE3tL5vXPTpP8BPUZHCBySMiCkvMKwpbd/kwVd45cVwgu0eqAIdCAA+X4M8 k+wo9xyKNDbKadnQt47EPTjatZcnz5fHxrOdw4rhLOu0HF3giiMu+uiomr3B1w0UM9AzG/ BTX3RRZoKLYULO6R9NkgMx5DZdbrV/O3c0aUCaJzQIAhImPGqhlSKUIH516SDg== 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 4jHwLk5bbfzPr1 for ; Mon, 02 Nov 2026 02:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32e6f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 02:16:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: b66922687718 - main - pkg: Enable FreeBSD-base by default List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches 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: b66922687718be12f8953c6de17f46de3e54a74d Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 02:16:46 +0000 Message-Id: <6ae7f28e.32e6f.706e53a@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b66922687718be12f8953c6de17f46de3e54a74d commit b66922687718be12f8953c6de17f46de3e54a74d Author: Colin Percival AuthorDate: 2026-10-18 18:18:59 +0000 Commit: Colin Percival CommitDate: 2026-11-02 02:16:23 +0000 pkg: Enable FreeBSD-base by default Enable the FreeBSD-base repository in all of the /etc/pkg/FreeBSD.conf variants, and remove code from various install paths which enabled the repository via /usr/local/etc/pkg/repos/FreeBSD.conf. Relnotes: yes Differential Revision: https://reviews.freebsd.org/D60946 --- UPDATING | 5 +++++ release/tools/oci-image-static.conf | 8 -------- release/tools/vmimage.subr | 4 ---- usr.sbin/bsdinstall/scripts/pkgbase.in | 4 ---- usr.sbin/pkg/FreeBSD.conf.latest | 5 ++--- usr.sbin/pkg/FreeBSD.conf.quarterly | 5 ++--- usr.sbin/pkg/FreeBSD.conf.quarterly-release | 5 ++--- 7 files changed, 11 insertions(+), 25 deletions(-) diff --git a/UPDATING b/UPDATING index 44b77a813e48..48cf1d2099d3 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20261018: + The FreeBSD-base repository is now enabled in /etc/pkg/FreeBSD.conf. + To disable it, edit that file or put "FreeBSD-base: { enabled: no }" + into /usr/local/etc/pkg/repos/FreeBSD.conf. + 20260919: less(1) has been updated to version 710, which removes the obsolete lesskey(1) utility. It is no longer built or installed, and the diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index 8d2d80744a19..051a3218cf75 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -26,12 +26,4 @@ oci_image_build() { TRUSTPATH=${srcdir}/secure/caroot/trusted \ UNTRUSTPATH=${srcdir}/secure/caroot/untrusted \ certctl -c rehash - # Generate a suitable repo config for pkgbase - mkdir -p $m/usr/local/etc/pkg/repos - cat > $m/usr/local/etc/pkg/repos/FreeBSD.conf < ${DESTDIR}/usr/local/etc/pkg/repos/FreeBSD.conf - metalog_add_data ./usr/local/etc/pkg/repos - metalog_add_data ./usr/local/etc/pkg/repos/FreeBSD.conf else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \ diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index 2c7d6bcae904..11b6c42d1bc0 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -368,10 +368,6 @@ local function pkgbase() if not os.execute(pkg .. "install -U -y -r FreeBSD-base " .. packages) then os.exit(1) end - - -- Enable the FreeBSD-base repository for this system. - assert(os.execute("mkdir -p " .. chroot .. "/usr/local/etc/pkg/repos")) - assert(os.execute("echo 'FreeBSD-base: { enabled: yes }' > " .. chroot .. "/usr/local/etc/pkg/repos/FreeBSD.conf")) end pkgbase() diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest index 0b6570cbd798..6124e01e585d 100644 --- a/usr.sbin/pkg/FreeBSD.conf.latest +++ b/usr.sbin/pkg/FreeBSD.conf.latest @@ -5,8 +5,7 @@ # mkdir -p /usr/local/etc/pkg/repos # echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf -# -# Note that the FreeBSD-base repository is disabled by default. +# echo "FreeBSD-base: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # FreeBSD-ports: { @@ -28,5 +27,5 @@ FreeBSD-base: { mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", - enabled: no + enabled: yes } diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly index 4579bb6d8395..88d26b35b7c3 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly @@ -6,8 +6,7 @@ # mkdir -p /usr/local/etc/pkg/repos # echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf -# -# Note that the FreeBSD-base repository is disabled by default. +# echo "FreeBSD-base: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # FreeBSD-ports: { @@ -29,5 +28,5 @@ FreeBSD-base: { mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", - enabled: no + enabled: yes } diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly-release b/usr.sbin/pkg/FreeBSD.conf.quarterly-release index e2f4ddf2d878..2f3f797e41ed 100644 --- a/usr.sbin/pkg/FreeBSD.conf.quarterly-release +++ b/usr.sbin/pkg/FreeBSD.conf.quarterly-release @@ -5,8 +5,7 @@ # mkdir -p /usr/local/etc/pkg/repos # echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf -# -# Note that the FreeBSD-base repository is disabled by default. +# echo "FreeBSD-base: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf # FreeBSD-ports: { @@ -28,5 +27,5 @@ FreeBSD-base: { mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkgbase-${VERSION_MAJOR}", - enabled: no + enabled: yes }