svn commit: r333474 - in stable/11: etc/pkg sys/conf

[Glen Barber]

Author: gjb
Date: Thu May 10 23:58:33 2018
New Revision: 333474
URL: https://svnweb.freebsd.org/changeset/base/333474

Log:
  Rename stable/11 from PRERELEASE to BETA1 as part of the 11.2-RELEASE
  cycle.
  
  Update the default pkg(8) repository to the 'quarterly' branch to
  prevent further 11.2 builds from downgrading packages when invoking
  'pkg upgrade' for the duration of the cycle.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/etc/pkg/FreeBSD.conf
  stable/11/sys/conf/newvers.sh

Modified: stable/11/etc/pkg/FreeBSD.conf
==============================================================================
--- stable/11/etc/pkg/FreeBSD.conf	Thu May 10 21:46:58 2018	(r333473)
+++ stable/11/etc/pkg/FreeBSD.conf	Thu May 10 23:58:33 2018	(r333474)
@@ -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: stable/11/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh	Thu May 10 21:46:58 2018	(r333473)
+++ stable/11/sys/conf/newvers.sh	Thu May 10 23:58:33 2018	(r333474)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="PRERELEASE"
+BRANCH="BETA1"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi