From owner-svn-src-all@freebsd.org Thu Jul 23 23:31:42 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BA799A9A0A; Thu, 23 Jul 2015 23:31:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A0F5106D; Thu, 23 Jul 2015 23:31:42 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6NNVgTM025093; Thu, 23 Jul 2015 23:31:42 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6NNVfAZ025090; Thu, 23 Jul 2015 23:31:41 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201507232331.t6NNVfAZ025090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 23 Jul 2015 23:31:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r285830 - in releng/10.2: . etc/pkg sys/conf sys/sys X-SVN-Group: releng 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.20 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: Thu, 23 Jul 2015 23:31:42 -0000 Author: gjb Date: Thu Jul 23 23:31:40 2015 New Revision: 285830 URL: https://svnweb.freebsd.org/changeset/base/285830 Log: - Copy stable/10@285827 to releng/10.2 in preparation for 10.2-RC1 builds. - Update newvers.sh to reflect RC1. - Update __FreeBSD_version to reflect 10.2. - Update default pkg(8) configuration to use the quarterly branch.[1] Discussed with: re, portmgr [1] Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Added: releng/10.2/ - copied from r285827, stable/10/ Modified: releng/10.2/etc/pkg/FreeBSD.conf releng/10.2/sys/conf/newvers.sh releng/10.2/sys/sys/param.h Modified: releng/10.2/etc/pkg/FreeBSD.conf ============================================================================== --- stable/10/etc/pkg/FreeBSD.conf Thu Jul 23 20:01:56 2015 (r285827) +++ releng/10.2/etc/pkg/FreeBSD.conf Thu Jul 23 23:31:40 2015 (r285830) @@ -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/10.2/sys/conf/newvers.sh ============================================================================== --- stable/10/sys/conf/newvers.sh Thu Jul 23 20:01:56 2015 (r285827) +++ releng/10.2/sys/conf/newvers.sh Thu Jul 23 23:31:40 2015 (r285830) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.2" -BRANCH="BETA2" +BRANCH="RC1" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/10.2/sys/sys/param.h ============================================================================== --- stable/10/sys/sys/param.h Thu Jul 23 20:01:56 2015 (r285827) +++ releng/10.2/sys/sys/param.h Thu Jul 23 23:31:40 2015 (r285830) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1001519 /* Master, propagated to newvers */ +#define __FreeBSD_version 1002000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,