aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2020-06-12 11:41:39 +0000
committerGlen Barber <gjb@FreeBSD.org>2020-06-12 11:41:39 +0000
commit6e5e8b4211afdf317bad33c9a9a81499b452d7bb (patch)
treedc6051051ba43bc7949f9c3953bd25f5afe19bfc
parent47bfe6b6f0881577e22da4fcab7350e7fa59aa85 (diff)
downloadsrc-6e5e8b4211afdf317bad33c9a9a81499b452d7bb.tar.gz
src-6e5e8b4211afdf317bad33c9a9a81499b452d7bb.zip
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)
Notes
Notes: svn path=/releng/11.4/; revision=362092
-rw-r--r--UPDATING3
-rw-r--r--lib/csu/common/crtbrand.c2
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 2 insertions, 5 deletions
diff --git a/UPDATING b/UPDATING
index 3ab424ed339e..632eafcfcffa 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,9 +16,6 @@ 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.
-20200616:
- 11.4-RELEASE.
-
20200609: 11.4-RC2-p1 FreeBSD-SA-20:17.usb
Fix USB HID descriptor parsing error. [SA-20:17.usb]
diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c
index 94d97bc70c06..a379dfa61085 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 = 1104001
+ .desc = __FreeBSD_version
};
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index ce94973f73fd..83f585aae37d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.4"
-BRANCH="RELEASE"
+BRANCH="RC2-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi