diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2021-03-02 15:11:04 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2023-07-22 03:20:13 +0000 |
| commit | 638dd626370e43e06ed0dfdb7e167290300fc01e (patch) | |
| tree | d6fd74c8e97f4e5c1d76ce04efe4a87abbe4782d /release | |
| parent | 9265ff1fe3571d2a28f16007e55fc1f32da1b3bb (diff) | |
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.inc1 | 3 | ||||
| -rw-r--r-- | release/Makefile.vm | 2 |
2 files changed, 4 insertions, 1 deletions
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 |