diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2018-11-23 16:32:27 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2018-11-23 16:32:27 +0000 |
| commit | 2d134a34df315c4204ff70ac30011c901906a6e6 (patch) | |
| tree | f5f9b04860ef90da12344df05c726156bf4d42fb | |
| parent | 50f530b444eff3e884e1f27554d5c3da736e7706 (diff) | |
- Update releng/12.0 from RC1 to RC2 as part of the 12.0-RELEASE
cycle.
- Update the dvd1.iso pkg(8) configuration to use the release_0
package set to populate the dvd.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/releng/12.0/; revision=340839
| -rw-r--r-- | release/pkg_repos/release-dvd.conf | 2 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf index 34997f2c7067..060bc150756b 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}/release_0", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8b6db2a03878..7e9ee09fb93b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.0" -BRANCH="RC1" +BRANCH="RC2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi |