From owner-svn-src-all@freebsd.org Fri Sep 20 00:05:16 2019 Return-Path: Delivered-To: svn-src-all@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 05608EA718; Fri, 20 Sep 2019 00:05:16 +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) server-signature RSA-PSS (4096 bits) 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 46ZDVz6RXGz4SNQ; Fri, 20 Sep 2019 00:05:15 +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 A36181D3BB; Fri, 20 Sep 2019 00:05:15 +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 x8K05FRP051628; Fri, 20 Sep 2019 00:05:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8K05E8D051625; Fri, 20 Sep 2019 00:05:14 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201909200005.x8K05E8D051625@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 20 Sep 2019 00:05:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r352546 - in releng/12.1: release/pkg_repos sys/conf sys/sys usr.sbin/pkg X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/12.1: release/pkg_repos sys/conf sys/sys usr.sbin/pkg X-SVN-Commit-Revision: 352546 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Sep 2019 00:05:16 -0000 Author: gjb Date: Fri Sep 20 00:05:14 2019 New Revision: 352546 URL: https://svnweb.freebsd.org/changeset/base/352546 Log: - Copy stable/12@r352480 to releng/12.1 as part of the 12.1 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) Added: - copied from r352480, stable/12/ Directory Properties: releng/12.1/ (props changed) Modified: releng/12.1/release/pkg_repos/release-dvd.conf releng/12.1/sys/conf/newvers.sh releng/12.1/sys/sys/param.h releng/12.1/usr.sbin/pkg/Makefile Modified: releng/12.1/release/pkg_repos/release-dvd.conf ============================================================================== --- stable/12/release/pkg_repos/release-dvd.conf Wed Sep 18 07:31:31 2019 (r352480) +++ releng/12.1/release/pkg_repos/release-dvd.conf Fri Sep 20 00:05:14 2019 (r352546) @@ -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.1/sys/conf/newvers.sh ============================================================================== --- stable/12/sys/conf/newvers.sh Wed Sep 18 07:31:31 2019 (r352480) +++ releng/12.1/sys/conf/newvers.sh Fri Sep 20 00:05:14 2019 (r352546) @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.1" -BRANCH="PRERELEASE" +BRANCH="BETA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/12.1/sys/sys/param.h ============================================================================== --- stable/12/sys/sys/param.h Wed Sep 18 07:31:31 2019 (r352480) +++ releng/12.1/sys/sys/param.h Fri Sep 20 00:05:14 2019 (r352546) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1200519 /* Master, propagated to newvers */ +#define __FreeBSD_version 1201000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, Modified: releng/12.1/usr.sbin/pkg/Makefile ============================================================================== --- stable/12/usr.sbin/pkg/Makefile Wed Sep 18 07:31:31 2019 (r352480) +++ releng/12.1/usr.sbin/pkg/Makefile Fri Sep 20 00:05:14 2019 (r352546) @@ -2,8 +2,15 @@ .if ${MACHINE} != "amd64" && ${MACHINE} != "i386" PKGCONFBRANCH?= quarterly -.endif +.else +_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH +BRANCH?= ${_BRANCH} +. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*} +PKGCONFBRANCH?= quarterly +. else PKGCONFBRANCH?= latest +. endif +.endif CONFS= FreeBSD.conf.${PKGCONFBRANCH} CONFSNAME= FreeBSD.conf CONFSDIR= /etc/pkg