diff options
| author | marius <marius@FreeBSD.org> | 2016-03-04 01:27:38 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2016-03-04 01:27:38 +0000 |
| commit | c7e729e17dd576bdb128a6846969f5d29e5de93e (patch) | |
| tree | 8a873286e58db992bff89179370ab8dc6031cbf3 | |
| parent | 86f5b30ace5c71d6d7ced267579015122d0165cd (diff) | |
| download | FreeBSD-src-c7e729e17dd576bdb128a6846969f5d29e5de93e.zip FreeBSD-src-c7e729e17dd576bdb128a6846969f5d29e5de93e.tar.gz | |
- Copy stable/10@296371 to releng/10.3 in preparation for 10.3-RC1
builds.
- Update newvers.sh to reflect RC1.
- Update __FreeBSD_version to reflect 10.3.
- Update default pkg(8) configuration to use the quarterly branch.
Approved by: re (implicit)
| -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 68556dd..df4b9e4 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="BETA3" +BRANCH="RC1" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/sys/param.h b/sys/sys/param.h index f1786f4..15c31d6 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 1002509 /* Master, propagated to newvers */ +#define __FreeBSD_version 1003000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, |
