svn commit: r323604 - in releng/10.4: release/pkg_repos sys/conf sys/sys

[Marius Strobl]

Author: marius
Date: Fri Sep 15 00:31:25 2017
New Revision: 323604
URL: https://svnweb.freebsd.org/changeset/base/323604

Log:
  - Copy stable/10 at 323601 to releng/10.4 in preparation for 10.4-RC1
    builds.
  - Update newvers.sh to reflect RC1.
  - Update __FreeBSD_version to reflect 10.4.
  - Switch the pkg(8) repository to use the 10.4 release package set for
    DVD image creation.
  
  Approved by:	re (implicit)

Added:
     - copied from r323601, stable/10/
Directory Properties:
  releng/10.4/   (props changed)
Modified:
  releng/10.4/release/pkg_repos/release-dvd.conf
  releng/10.4/sys/conf/newvers.sh
  releng/10.4/sys/sys/param.h

Modified: releng/10.4/release/pkg_repos/release-dvd.conf
==============================================================================
--- stable/10/release/pkg_repos/release-dvd.conf	Thu Sep 14 22:19:56 2017	(r323601)
+++ releng/10.4/release/pkg_repos/release-dvd.conf	Fri Sep 15 00:31:25 2017	(r323604)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 release: {
-  url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/release_4",
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkg",

Modified: releng/10.4/sys/conf/newvers.sh
==============================================================================
--- stable/10/sys/conf/newvers.sh	Thu Sep 14 22:19:56 2017	(r323601)
+++ releng/10.4/sys/conf/newvers.sh	Fri Sep 15 00:31:25 2017	(r323604)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.4"
-BRANCH="BETA4"
+BRANCH="RC1"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/10.4/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h	Thu Sep 14 22:19:56 2017	(r323601)
+++ releng/10.4/sys/sys/param.h	Fri Sep 15 00:31:25 2017	(r323604)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1003516	/* Master, propagated to newvers */
+#define __FreeBSD_version 1004000	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,