aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.vm
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2020-01-13 16:31:00 +0000
committerGlen Barber <gjb@FreeBSD.org>2020-01-13 16:31:00 +0000
commite2827b51f0b291de9fa12a37c45fe0b11d87e7e1 (patch)
treef55aa5e46b1cbae985c2f67a1aeeefb179a9ceb0 /release/Makefile.vm
parentfb27d7ae7ce7eb3267294fd1b58b5885d3858da4 (diff)
downloadsrc-e2827b51f0b291de9fa12a37c45fe0b11d87e7e1.tar.gz
src-e2827b51f0b291de9fa12a37c45fe0b11d87e7e1.zip
Ensure the TYPE, BRANCH, and REVISION variables are set in
cloudware targets when OSRELEASE is overridden. Submitted by: Trond Endrestol PR: 243287 MFC after: 3 days Sponsored by: Rubicon Communications, LLC (netgate.com)
Notes
Notes: svn path=/head/; revision=356685
Diffstat (limited to 'release/Makefile.vm')
-rw-r--r--release/Makefile.vm6
1 files changed, 6 insertions, 0 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 8f6f65b08032..8a46a640438b 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -39,6 +39,12 @@ VAGRANT-VMWARE_FORMAT= vmdk
VAGRANT-VMWARE_DESC= Vagrant Image for VMWare
VAGRANT-VMWARE_DISK= ${OSRELEASE}.vmware.${VAGRANT_FORMAT}
+.for _V in TYPE BRANCH REVISION
+. if !defined(${_V}) || empty(${_V})
+${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
+. endif
+.endfor
+
emulator-portinstall:
.if ${TARGET_ARCH} != ${MACHINE_ARCH}
.if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" )