Author: cperciva
Date: Wed Apr 24 06:25:21 2019
New Revision: 346628
URL: https://svnweb.freebsd.org/changeset/base/346628
Log:
Keep two versions of the FreeBSD.conf pkg configuration file; one which
points at the "latest" branch and one which points at the "quarterly"
branch. Install the "latest" version unless overridden via the newly
added PKGCONFBRANCH variable.
This does not change user-visible behaviour (assuming said vairable is
not set) but will make it easier to change the defaults in the future --
on stable branches we will want "latest" on x86 but "quarterly" elsewhere.
Discussed with: gjb
MFC after: 3 days
X-MFC: After MFCing this I'll make a direct commit to stable/*
to
switch non-x86 architectures to "quarterly".
Added:
head/usr.sbin/pkg/FreeBSD.conf.latest
- copied unchanged from r346627, head/usr.sbin/pkg/FreeBSD.conf
head/usr.sbin/pkg/FreeBSD.conf.quarterly
- copied, changed from r346627, head/usr.sbin/pkg/FreeBSD.conf
Deleted:
head/usr.sbin/pkg/FreeBSD.conf
Modified:
head/usr.sbin/pkg/Makefile
Copied: head/usr.sbin/pkg/FreeBSD.conf.latest (from r346627,
head/usr.sbin/pkg/FreeBSD.conf)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/pkg/FreeBSD.conf.latest Wed Apr 24 06:25:21 2019
(r346628, copy of r346627, head/usr.sbin/pkg/FreeBSD.conf)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+# To disable this repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
+#
+# mkdir -p /usr/local/etc/pkg/repos
+# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#
+
+FreeBSD: {
+ url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest";,
+ mirror_type: "srv",
+ signature_type: "fingerprints",
+ fingerprints: "/usr/share/keys/pkg",
+ enabled: yes
+}
Copied and modified: head/usr.sbin/pkg/FreeBSD.conf.quarterly (from r346627,
head/usr.sbin/pkg/FreeBSD.conf)
==============================================================================
--- head/usr.sbin/pkg/FreeBSD.conf Wed Apr 24 05:52:24 2019
(r346627, copy source)
+++ head/usr.sbin/pkg/FreeBSD.conf.quarterly Wed Apr 24 06:25:21 2019
(r346628)
@@ -8,7 +8,7 @@
#
FreeBSD: {
- url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest";,
+ url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly";,
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/share/keys/pkg",
Modified: head/usr.sbin/pkg/Makefile
==============================================================================
--- head/usr.sbin/pkg/Makefile Wed Apr 24 05:52:24 2019 (r346627)
+++ head/usr.sbin/pkg/Makefile Wed Apr 24 06:25:21 2019 (r346628)
@@ -1,6 +1,8 @@
# $FreeBSD$
-CONFS= FreeBSD.conf
+PKGCONFBRANCH?= latest
+CONFS= FreeBSD.conf.${PKGCONFBRANCH}
+CONFSNAME= FreeBSD.conf
CONFSDIR= /etc/pkg
CONFSMODE= 644
PROG= pkg
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
