From owner-svn-src-releng@freebsd.org Thu Sep 10 23:57:00 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BD60D3E73DD; Thu, 10 Sep 2020 23:57:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BnbQh4c1Tz4p8p; Thu, 10 Sep 2020 23:57:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 81BF61B388; Thu, 10 Sep 2020 23:57:00 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08ANv0k6066508; Thu, 10 Sep 2020 23:57:00 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08ANv084066503; Thu, 10 Sep 2020 23:57:00 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202009102357.08ANv084066503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 10 Sep 2020 23:57:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365618 - in releng/12.2: release/pkg_repos sys/conf sys/sys X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/12.2: release/pkg_repos sys/conf sys/sys X-SVN-Commit-Revision: 365618 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2020 23:57:00 -0000 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@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,