diff options
| author | gjb <gjb@FreeBSD.org> | 2016-08-11 23:39:23 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-08-11 23:39:23 +0000 |
| commit | f24d2daff0a028e02cb47255c6e2ef343081ce73 (patch) | |
| tree | c3eb7036837f8de8418fcc879e70167753f22b18 | |
| parent | 07c8f0654ee0b98f45b11e7fec38bc6f4e0b4ec6 (diff) | |
| download | FreeBSD-src-f24d2daff0a028e02cb47255c6e2ef343081ce73.zip FreeBSD-src-f24d2daff0a028e02cb47255c6e2ef343081ce73.tar.gz | |
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
| -rw-r--r-- | etc/pkg/FreeBSD.conf | 2 | ||||
| -rw-r--r-- | release/pkg_repos/release-dvd.conf | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/sys/param.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf index e4eec8f..68e1d32 100644 --- a/etc/pkg/FreeBSD.conf +++ b/etc/pkg/FreeBSD.conf @@ -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", diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf index 9541359..34997f2 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}/latest", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d85046c..8d795a9 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="11.0" -BRANCH="BETA4" +BRANCH="RC1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/sys/param.h b/sys/sys/param.h index 5da8016..7aae00d 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 1100120 /* Master, propagated to newvers */ +#define __FreeBSD_version 1101000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, |
