The branch main has been updated by bapt:
URL:
https://cgit.FreeBSD.org/src/commit/?id=db6f6cc583bde6c21618ab4a4ab926f9d57b1641
commit db6f6cc583bde6c21618ab4a4ab926f9d57b1641
Author: Baptiste Daroussin <b...@freebsd.org>
AuthorDate: 2025-06-03 14:20:20 +0000
Commit: Baptiste Daroussin <b...@freebsd.org>
CommitDate: 2025-06-03 15:48:15 +0000
pkg.conf: add valid configurations for kmods for all branches
MFC After: 1 week
Reviewed by: cperciva
Differential Revision: https://reviews.freebsd.org/D50668
---
usr.sbin/pkg/FreeBSD.conf.latest | 2 +-
usr.sbin/pkg/FreeBSD.conf.quarterly | 2 +-
usr.sbin/pkg/FreeBSD.conf.quarterly-release | 23 +++++++++++++++++++++++
usr.sbin/pkg/Makefile | 2 +-
4 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest
index 2175a3387437..8c68118c4938 100644
--- a/usr.sbin/pkg/FreeBSD.conf.latest
+++ b/usr.sbin/pkg/FreeBSD.conf.latest
@@ -15,7 +15,7 @@ FreeBSD: {
enabled: yes
}
FreeBSD-kmods: {
- url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_latest_${VERSION_MINOR}";,
+ url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_latest";,
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/share/keys/pkg",
diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly
b/usr.sbin/pkg/FreeBSD.conf.quarterly
index bd0ee13b9b43..884226fc02d1 100644
--- a/usr.sbin/pkg/FreeBSD.conf.quarterly
+++ b/usr.sbin/pkg/FreeBSD.conf.quarterly
@@ -15,7 +15,7 @@ FreeBSD: {
enabled: yes
}
FreeBSD-kmods: {
- url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly_${VERSION_MINOR}";,
+ url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly";,
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/share/keys/pkg",
diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly-release
b/usr.sbin/pkg/FreeBSD.conf.quarterly-release
new file mode 100644
index 000000000000..bd0ee13b9b43
--- /dev/null
+++ b/usr.sbin/pkg/FreeBSD.conf.quarterly-release
@@ -0,0 +1,23 @@
+#
+# To disable a repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.:
+#
+# mkdir -p /usr/local/etc/pkg/repos
+# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+# echo "FreeBSD-kmods: { enabled: no }" >>
/usr/local/etc/pkg/repos/FreeBSD.conf
+#
+
+FreeBSD: {
+ url: "pkg+https://pkg.FreeBSD.org/${ABI}/quarterly";,
+ mirror_type: "srv",
+ signature_type: "fingerprints",
+ fingerprints: "/usr/share/keys/pkg",
+ enabled: yes
+}
+FreeBSD-kmods: {
+ url: "pkg+https://pkg.FreeBSD.org/${ABI}/kmods_quarterly_${VERSION_MINOR}";,
+ mirror_type: "srv",
+ signature_type: "fingerprints",
+ fingerprints: "/usr/share/keys/pkg",
+ enabled: yes
+}
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index 2fa0dbb053ad..0420065bb7eb 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -6,7 +6,7 @@ BRANCH?= ${_BRANCH}
PKGCONFBRANCH?= latest
.else
. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
-PKGCONFBRANCH?= quarterly
+PKGCONFBRANCH?= quarterly-release
. else
. if ${MACHINE} != "amd64" && ${MACHINE} != "i386" && ${MACHINE} != "arm64"
PKGCONFBRANCH?= quarterly
