From e2827b51f0b291de9fa12a37c45fe0b11d87e7e1 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 13 Jan 2020 16:31:00 +0000
Subject: [PATCH] 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)
---
 release/Makefile.vm | 6 ++++++
 1 file changed, 6 insertions(+)

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" )