svn commit: r365618 - in releng/12.2: release/pkg_repos sys/conf sys/sys

[Glen Barber]

Author: gjb
Date: Thu Sep 10 23:56:59 2020
New Revision: 365618
URL: https://svnweb.freebsd.org/changeset/base/365618

Log:
  - Copy stable/12 at r365545 to releng/12.2 as part of the 12.2-RELEASE
    cycle.
  - Update from PRERELEASE to BETA1.
  - Set the default pkg(7) repository to 'quarterly'.
  - Bump __FreeBSD_version.
  - Prune svn:mergeinfo from the new branch.
  
  Approved by:	re (implicit)
  
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Added:
     - copied from r365545, stable/12/
Directory Properties:
  releng/12.2/   (props changed)
Modified:
  releng/12.2/release/pkg_repos/release-dvd.conf
  releng/12.2/sys/conf/newvers.sh
  releng/12.2/sys/sys/param.h

Modified: releng/12.2/release/pkg_repos/release-dvd.conf
==============================================================================
--- stable/12/release/pkg_repos/release-dvd.conf	Wed Sep  9 23:11:55 2020	(r365545)
+++ releng/12.2/release/pkg_repos/release-dvd.conf	Thu Sep 10 23:56:59 2020	(r365618)
@@ -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: releng/12.2/sys/conf/newvers.sh
==============================================================================
--- stable/12/sys/conf/newvers.sh	Wed Sep  9 23:11:55 2020	(r365545)
+++ releng/12.2/sys/conf/newvers.sh	Thu Sep 10 23:56:59 2020	(r365618)
@@ -49,7 +49,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.2"
-BRANCH=${BRANCH_OVERRIDE:-PRERELEASE}
+BRANCH=${BRANCH_OVERRIDE:-BETA1}
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
 

Modified: releng/12.2/sys/sys/param.h
==============================================================================
--- stable/12/sys/sys/param.h	Wed Sep  9 23:11:55 2020	(r365545)
+++ releng/12.2/sys/sys/param.h	Thu Sep 10 23:56:59 2020	(r365618)
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1201525	/* Master, propagated to newvers */
+#define __FreeBSD_version 1202000	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,