Date: Thu, 11 Aug 2016 23:39:23 +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: r303975 - in releng/11.0: etc/pkg release/pkg_repos sys/conf sys/sys Message-ID: <201608112339.u7BNdNKN040840@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Aug 11 23:39:23 2016 New Revision: 303975 URL: https://svnweb.freebsd.org/changeset/base/303975 Log: Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASE cycle. Prune svn:mergeinfo from the new branch, and rename it to RC1. Update __FreeBSD_version. Use the quarterly branch for the default FreeBSD.conf pkg(8) repo and the dvd1.iso packages population. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Added: - copied from r303970, stable/11/ Directory Properties: releng/11.0/ (props changed) Modified: releng/11.0/etc/pkg/FreeBSD.conf releng/11.0/release/pkg_repos/release-dvd.conf releng/11.0/sys/conf/newvers.sh releng/11.0/sys/sys/param.h Modified: releng/11.0/etc/pkg/FreeBSD.conf ============================================================================== --- stable/11/etc/pkg/FreeBSD.conf Thu Aug 11 20:48:03 2016 (r303970) +++ releng/11.0/etc/pkg/FreeBSD.conf Thu Aug 11 23:39:23 2016 (r303975) @@ -8,7 +8,7 @@ # FreeBSD: { - 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/11.0/release/pkg_repos/release-dvd.conf ============================================================================== --- stable/11/release/pkg_repos/release-dvd.conf Thu Aug 11 20:48:03 2016 (r303970) +++ releng/11.0/release/pkg_repos/release-dvd.conf Thu Aug 11 23:39:23 2016 (r303975) @@ -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/11.0/sys/conf/newvers.sh ============================================================================== --- stable/11/sys/conf/newvers.sh Thu Aug 11 20:48:03 2016 (r303970) +++ releng/11.0/sys/conf/newvers.sh Thu Aug 11 23:39:23 2016 (r303975) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="11.0" -BRANCH="BETA4" +BRANCH="RC1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/11.0/sys/sys/param.h ============================================================================== --- stable/11/sys/sys/param.h Thu Aug 11 20:48:03 2016 (r303970) +++ releng/11.0/sys/sys/param.h Thu Aug 11 23:39:23 2016 (r303975) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100120 /* Master, propagated to newvers */ +#define __FreeBSD_version 1101000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608112339.u7BNdNKN040840>