svn commit: r353708 - in releng/12.1: release/pkg_repos sys/conf

[Glen Barber]

Author: gjb
Date: Fri Oct 18 00:00:11 2019
New Revision: 353708
URL: https://svnweb.freebsd.org/changeset/base/353708

Log:
  - Update releng/12.1 from RC1 to RC2 as part of the 12.1-RELEASE
    cycle.
  - Update the dvd1.iso pkg(8) configuration to use the release_1
    package set to populate the dvd.
  
  Approved by:	re (implicit)
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  releng/12.1/release/pkg_repos/release-dvd.conf
  releng/12.1/sys/conf/newvers.sh

Modified: releng/12.1/release/pkg_repos/release-dvd.conf
==============================================================================
--- releng/12.1/release/pkg_repos/release-dvd.conf	Thu Oct 17 23:48:29 2019	(r353707)
+++ releng/12.1/release/pkg_repos/release-dvd.conf	Fri Oct 18 00:00:11 2019	(r353708)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 release: {
-  url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/release_1",
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkg",

Modified: releng/12.1/sys/conf/newvers.sh
==============================================================================
--- releng/12.1/sys/conf/newvers.sh	Thu Oct 17 23:48:29 2019	(r353707)
+++ releng/12.1/sys/conf/newvers.sh	Fri Oct 18 00:00:11 2019	(r353708)
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="RC1"
+BRANCH="RC2"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi