Date: Fri, 8 May 2020 00:03:00 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r360804 - in releng/11.4: etc/pkg release/pkg_repos sys/conf sys/sys Message-ID: <202005080003.048030ZI000286@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri May 8 00:02:59 2020 New Revision: 360804 URL: https://svnweb.freebsd.org/changeset/base/360804 Log: - 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) Added: - copied from r360774, stable/11/ Directory Properties: releng/11.4/ (props changed) Modified: releng/11.4/etc/pkg/FreeBSD.conf releng/11.4/release/pkg_repos/release-dvd.conf releng/11.4/sys/conf/newvers.sh releng/11.4/sys/sys/param.h Directory Properties: releng/11.4/contrib/llvm-project/clang/ (props changed) releng/11.4/contrib/llvm-project/compiler-rt/ (props changed) releng/11.4/contrib/llvm-project/libcxx/ (props changed) releng/11.4/contrib/llvm-project/libunwind/ (props changed) releng/11.4/contrib/llvm-project/lld/ (props changed) releng/11.4/contrib/llvm-project/lldb/ (props changed) releng/11.4/contrib/llvm-project/llvm/ (props changed) releng/11.4/contrib/llvm-project/openmp/ (props changed) Modified: releng/11.4/etc/pkg/FreeBSD.conf ============================================================================== --- stable/11/etc/pkg/FreeBSD.conf Thu May 7 08:22:47 2020 (r360774) +++ releng/11.4/etc/pkg/FreeBSD.conf Fri May 8 00:02:59 2020 (r360804) @@ -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", Modified: releng/11.4/release/pkg_repos/release-dvd.conf ============================================================================== --- stable/11/release/pkg_repos/release-dvd.conf Thu May 7 08:22:47 2020 (r360774) +++ releng/11.4/release/pkg_repos/release-dvd.conf Fri May 8 00:02:59 2020 (r360804) @@ -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", Modified: releng/11.4/sys/conf/newvers.sh ============================================================================== --- stable/11/sys/conf/newvers.sh Thu May 7 08:22:47 2020 (r360774) +++ releng/11.4/sys/conf/newvers.sh Fri May 8 00:02:59 2020 (r360804) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.4" -BRANCH="PRERELEASE" +BRANCH="BETA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/11.4/sys/sys/param.h ============================================================================== --- stable/11/sys/sys/param.h Thu May 7 08:22:47 2020 (r360774) +++ releng/11.4/sys/sys/param.h Fri May 8 00:02:59 2020 (r360804) @@ -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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005080003.048030ZI000286>