From c511a5ab53ba335dc85f7ac93843872eb5763602 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 10 Feb 2021 21:23:58 -0500
Subject: [PATCH] release: fix overriding UNAME_r

Sponsored by:	Rubicon Communications, LLC ("Netgate")
---
 release/tools/arm.subr | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 1d4ae17d3851..343d9f3a7034 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -175,6 +175,10 @@ arm_install_base() {
 	if [ "${PART_SCHEME}" == "MBR" ]; then
 		chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${DESTDIR}
 	fi
+	_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
+	REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+	BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+	export UNAME_r=${REVISION}-${BRANCH}
 	eval chroot ${CHROOTDIR} make -C ${WORLDDIR} \
 		TARGET=${EMBEDDED_TARGET} \
 		TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \