svn commit: r340161 - in stable/12: release/pkg_repos usr.sbin/pkg

[Glen Barber]

Author: gjb
Date: Mon Nov  5 21:28:32 2018
New Revision: 340161
URL: https://svnweb.freebsd.org/changeset/base/340161

Log:
  Switch the dvd1.iso pkg(8) configuration to use the quarterly
  branch, now that the package sets are now available.  This
  normally would have been after BETA1, however there were issues
  preventing package builds to succeed.
  
  Switch the default pkg(8) repository to the quarterly branch
  as well, to prevent 'pkg upgrade' from downgrading packages
  as the 12.0-RELEASE cycle progresses.
  
  These changes will be reverted after releng/12.0 is branched.
  
  This is a direct commit to stable/12.
  
  MFC after:	2 weeks
  MFC note:	fake MFC timeframe as a reminder to revert
  Approved by:	re (delphij)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/12/release/pkg_repos/release-dvd.conf
  stable/12/usr.sbin/pkg/FreeBSD.conf

Modified: stable/12/release/pkg_repos/release-dvd.conf
==============================================================================
--- stable/12/release/pkg_repos/release-dvd.conf	Mon Nov  5 21:01:45 2018	(r340160)
+++ stable/12/release/pkg_repos/release-dvd.conf	Mon Nov  5 21:28:32 2018	(r340161)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 release: {
-  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: stable/12/usr.sbin/pkg/FreeBSD.conf
==============================================================================
--- stable/12/usr.sbin/pkg/FreeBSD.conf	Mon Nov  5 21:01:45 2018	(r340160)
+++ stable/12/usr.sbin/pkg/FreeBSD.conf	Mon Nov  5 21:28:32 2018	(r340161)
@@ -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",