summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2017-09-15 00:32:22 +0000
committermarius <marius@FreeBSD.org>2017-09-15 00:32:22 +0000
commit759dfbc318e830445230739d439532b063efce94 (patch)
tree8d7c9dd3ffb15dba875209feaa84ac7c04b61b3a
parent1c408c4d1f722c1630aebe5c647bbb370c106c46 (diff)
downloadFreeBSD-src-759dfbc318e830445230739d439532b063efce94.zip
FreeBSD-src-759dfbc318e830445230739d439532b063efce94.tar.gz
- 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)
-rw-r--r--etc/pkg/FreeBSD.conf2
-rw-r--r--release/pkg_repos/release-dvd.conf2
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/sys/param.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf
index 68e1d32..e4eec8f 100644
--- a/etc/pkg/FreeBSD.conf
+++ b/etc/pkg/FreeBSD.conf
@@ -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",
diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf
index 34997f2..9541359 100644
--- a/release/pkg_repos/release-dvd.conf
+++ b/release/pkg_repos/release-dvd.conf
@@ -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",
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index ea7247e..2e040bd 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.4"
-BRANCH="BETA4"
+BRANCH="PRERELEASE"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
diff --git a/sys/sys/param.h b/sys/sys/param.h
index ca1ecfc..b8be153 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -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,
OpenPOWER on IntegriCloud