The branch main has been updated by gjb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c511a5ab53ba335dc85f7ac93843872eb5763602
commit c511a5ab53ba335dc85f7ac93843872eb5763602
Author: Glen Barber <g...@freebsd.org>
AuthorDate: 2021-02-11 02:23:58 +0000
Commit: Glen Barber <g...@freebsd.org>
CommitDate: 2021-02-11 02:23:58 +0000
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} \
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
