Author: cperciva
Date: Sat Apr 27 04:00:50 2019
New Revision: 346780
URL: https://svnweb.freebsd.org/changeset/base/346780
Log:
MFC r346628: Split the pkg configuration file FreeBSD.conf into versions
for {latest, quarterly} and use Makefile logic to decide which one to
install (right now, unconditionally "latest").
Discussed with: gjb
Added:
stable/12/usr.sbin/pkg/FreeBSD.conf.latest
- copied unchanged from r346628, head/usr.sbin/pkg/FreeBSD.conf.latest
stable/12/usr.sbin/pkg/FreeBSD.conf.quarterly
- copied unchanged from r346628, head/usr.sbin/pkg/FreeBSD.conf.quarterly
Deleted:
stable/12/usr.sbin/pkg/FreeBSD.conf
Modified:
stable/12/usr.sbin/pkg/Makefile
Directory Properties:
stable/12/ (props changed)
Copied: stable/12/usr.sbin/pkg/FreeBSD.conf.latest (from r346628,
head/usr.sbin/pkg/FreeBSD.conf.latest)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/12/usr.sbin/pkg/FreeBSD.conf.latest Sat Apr 27 04:00:50 2019
(r346780, copy of r346628, head/usr.sbin/pkg/FreeBSD.conf.latest)
@@ -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: stable/12/usr.sbin/pkg/FreeBSD.conf.quarterly (from r346628,
head/usr.sbin/pkg/FreeBSD.conf.quarterly)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/12/usr.sbin/pkg/FreeBSD.conf.quarterly Sat Apr 27 04:00:50
2019 (r346780, copy of r346628, head/usr.sbin/pkg/FreeBSD.conf.quarterly)
@@ -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}/quarterly";,
+ mirror_type: "srv",
+ signature_type: "fingerprints",
+ fingerprints: "/usr/share/keys/pkg",
+ enabled: yes
+}
Modified: stable/12/usr.sbin/pkg/Makefile
==============================================================================
--- stable/12/usr.sbin/pkg/Makefile Sat Apr 27 02:43:27 2019
(r346779)
+++ stable/12/usr.sbin/pkg/Makefile Sat Apr 27 04:00:50 2019
(r346780)
@@ -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-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
