aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2020-05-08 00:02:59 +0000
committerGlen Barber <gjb@FreeBSD.org>2020-05-08 00:02:59 +0000
commite41d9ac6a014b732d3690e8418fb64faf21cbf39 (patch)
tree13018f30ec70dc71002a96ef0564a174b7b975ca
parent5194f6c7ecdf31a57441d0a847d7776f06342993 (diff)
downloadsrc-e41d9ac6a014b732d3690e8418fb64faf21cbf39.tar.gz
src-e41d9ac6a014b732d3690e8418fb64faf21cbf39.zip
- Copy stable/11@r360774 to releng/11.4 as part of the 11.4-RELEASE
cycle. - Update releng/11.4 from PRERELEASE to BETA1. - Switch the default dvd1.iso pkg(8) repository from latest to - quarterly. - Bump __FreeBSD_version. - Prune vestigial svn:mergeinfo from the new branch. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com)
Notes
Notes: svn path=/releng/11.4/; revision=360804
-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 e4eec8f11451..68e1d32ac680 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 95413592b719..34997f2c7067 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 202befa08e7a..7fed98083aeb 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.4"
-BRANCH="PRERELEASE"
+BRANCH="BETA1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 4c3a6ffaedc4..bbd1b82d35c3 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 1103510 /* Master, propagated to newvers */
+#define __FreeBSD_version 1104000 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,