git: 638dd626370e - stable/13 - release: Adjust where UNAME_r is defined for ports builds

From: Glen Barber <gjb_at_FreeBSD.org>
Date: Sat, 22 Jul 2023 03:24:32 UTC
The branch stable/13 has been updated by gjb:

URL: https://cgit.FreeBSD.org/src/commit/?id=638dd626370e43e06ed0dfdb7e167290300fc01e

commit 638dd626370e43e06ed0dfdb7e167290300fc01e
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2021-03-02 15:11:04 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2023-07-22 03:20:13 +0000

    release: Adjust where UNAME_r is defined for ports builds
    
    In followup to 80ab50e1de19ca125f05a13937c796d48c4edd4a,
    export UNAME_r in Makefile.inc1 instead of Makefile.vm.
    
    Sponsored by:   GoFundMe https://www.gofundme.com/f/gjbbsd
    Sponsored by:   PayPal https://paypal.me/gjbbsd
    
    (cherry picked from commit 0be274d3737972532c042d06c53b5807e95aa845)
---
 release/Makefile.inc1 | 3 +++
 release/Makefile.vm   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/release/Makefile.inc1 b/release/Makefile.inc1
index da7226dfa890..99d61a45e700 100644
--- a/release/Makefile.inc1
+++ b/release/Makefile.inc1
@@ -40,3 +40,6 @@ BUILDDATE!=		date +%Y%m%d
 .export BUILDDATE
 .endif
 
+# Override UNAME_r to allow building ports for a different branch.
+UNAME_r=	${REVISION}-${BRANCH}
+.export UNAME_r
diff --git a/release/Makefile.vm b/release/Makefile.vm
index c652d393d64a..abd5f4c5de00 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -58,7 +58,7 @@ emulator-portinstall:
 .if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" )
 .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static)
 .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile)
-	env - UNAME_r="${REVISION}-${BRANCH}" PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean
+	env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean
 .else
 .if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -y