From fdfee0c2586dcaf3a7c2f2f594df822174f4d295 Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 4 Jul 2019 23:58:11 +0000 Subject: [PATCH] - Switch releng/11.3 to -RELEASE. - Add the anticipated 11.3-RELEASE date to UPDATING. - Set a static __FreeBSD_version. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (Netgate) --- UPDATING | 3 +++ lib/csu/common/crtbrand.c | 2 +- sys/conf/newvers.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index b94b49b511a..d204d76eb23 100644 --- a/UPDATING +++ b/UPDATING @@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20190709: + 11.3-RELEASE. + 20190702 p1 FreeBSD-EN-19:12.tzdata FreeBSD-SA-19:09.iconv FreeBSD-SA-19:11.cd_ioctl diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c index a379dfa6108..4215cc4b189 100644 --- a/lib/csu/common/crtbrand.c +++ b/lib/csu/common/crtbrand.c @@ -63,5 +63,5 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = __FreeBSD_version + .desc = 1103000 }; diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 5fc9e960e99..0e7551ae757 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.3" -BRANCH="RC3-p1" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi -- 2.45.0