Date: Fri, 20 Sep 2019 00:05:14 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> 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 Message-ID: <201909200005.x8K05E8D051625@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909200005.x8K05E8D051625>