Author: marius
Date: Fri Sep 15 00:32:22 2017
New Revision: 323605
URL: https://svnweb.freebsd.org/changeset/base/323605
Log:
- Reset stable/10 back to -PRERELEASE status now that releng/10.4
has been branched.
- Update __FreeBSD_version to reflect the new -STABLE branch.
- Switch the pkg(8) configuration for the default installation and the
DVD image creation back to the latest set, i. e. revert r322737.
Approved by: re (implicit)
Modified:
stable/10/etc/pkg/FreeBSD.conf
stable/10/release/pkg_repos/release-dvd.conf
stable/10/sys/conf/newvers.sh
stable/10/sys/sys/param.h
Modified: stable/10/etc/pkg/FreeBSD.conf
==============================================================================
--- stable/10/etc/pkg/FreeBSD.conf Fri Sep 15 00:31:25 2017
(r323604)
+++ stable/10/etc/pkg/FreeBSD.conf Fri Sep 15 00:32:22 2017
(r323605)
@@ -8,7 +8,7 @@
#
FreeBSD: {
- url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly";,
+ url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest";,
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/share/keys/pkg",
Modified: stable/10/release/pkg_repos/release-dvd.conf
==============================================================================
--- stable/10/release/pkg_repos/release-dvd.conf Fri Sep 15 00:31:25
2017 (r323604)
+++ stable/10/release/pkg_repos/release-dvd.conf Fri Sep 15 00:32:22
2017 (r323605)
@@ -1,6 +1,6 @@
# $FreeBSD$
release: {
- url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly";,
+ url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest";,
mirror_type: "srv",
signature_type: "fingerprints",
fingerprints: "/usr/share/keys/pkg",
Modified: stable/10/sys/conf/newvers.sh
==============================================================================
--- stable/10/sys/conf/newvers.sh Fri Sep 15 00:31:25 2017
(r323604)
+++ stable/10/sys/conf/newvers.sh Fri Sep 15 00:32:22 2017
(r323605)
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.4"
-BRANCH="BETA4"
+BRANCH="PRERELEASE"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: stable/10/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h Fri Sep 15 00:31:25 2017 (r323604)
+++ stable/10/sys/sys/param.h Fri Sep 15 00:32:22 2017 (r323605)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1003516 /* Master, propagated to newvers */
+#define __FreeBSD_version 1004500 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
