Date: Fri, 12 Jun 2020 11:41:39 +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: r362092 - in releng/11.4: . lib/csu/common sys/conf Message-ID: <202006121141.05CBfdJU011814@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Jun 12 11:41:39 2020 New Revision: 362092 URL: https://svnweb.freebsd.org/changeset/base/362092 Log: Revert r362079 in order to correct an issue that triggered a build failure in 11.4-RELEASE builds. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/UPDATING releng/11.4/lib/csu/common/crtbrand.c releng/11.4/sys/conf/newvers.sh Modified: releng/11.4/UPDATING ============================================================================== --- releng/11.4/UPDATING Fri Jun 12 10:43:21 2020 (r362091) +++ releng/11.4/UPDATING Fri Jun 12 11:41:39 2020 (r362092) @@ -16,9 +16,6 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 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. -20200616: - 11.4-RELEASE. - 20200609: 11.4-RC2-p1 FreeBSD-SA-20:17.usb Fix USB HID descriptor parsing error. [SA-20:17.usb] Modified: releng/11.4/lib/csu/common/crtbrand.c ============================================================================== --- releng/11.4/lib/csu/common/crtbrand.c Fri Jun 12 10:43:21 2020 (r362091) +++ releng/11.4/lib/csu/common/crtbrand.c Fri Jun 12 11:41:39 2020 (r362092) @@ -63,5 +63,5 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = 1104001 + .desc = __FreeBSD_version }; Modified: releng/11.4/sys/conf/newvers.sh ============================================================================== --- releng/11.4/sys/conf/newvers.sh Fri Jun 12 10:43:21 2020 (r362091) +++ releng/11.4/sys/conf/newvers.sh Fri Jun 12 11:41:39 2020 (r362092) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.4" -BRANCH="RELEASE" +BRANCH="RC2-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006121141.05CBfdJU011814>