Page MenuHomeFreeBSD
Files F176834957

D60946.1793454118.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D60946.1793454118.diff
View Options

diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,11 @@
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
--- a/release/tools/oci-image-static.conf
+++ b/release/tools/oci-image-static.conf
@@ -26,12 +26,4 @@
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 <<EOF
-FreeBSD-base: {
- enabled: yes
-}
-EOF
-
}
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -107,10 +107,6 @@
selected=$(vm_base_packages_list | vm_extra_filter_base_packages)
$pkg_cmd install -U -r FreeBSD-base $selected
metalog_add_data ./var/db/pkg/local.sqlite
- mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos
- echo 'FreeBSD-base: { enabled: yes }' > ${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
--- a/usr.sbin/bsdinstall/scripts/pkgbase.in
+++ b/usr.sbin/bsdinstall/scripts/pkgbase.in
@@ -368,10 +368,6 @@
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
--- 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 @@
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
--- 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 @@
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
--- 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 @@
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/share/keys/pkgbase-${VERSION_MAJOR}",
- enabled: no
+ enabled: yes
}

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 31, 1:41 PM (6 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41236607
Default Alt Text
D60946.1793454118.diff (4 KB)

Event Timeline