svn commit: r356685 - head/release

[Glen Barber]

Author: gjb
Date: Mon Jan 13 16:31:00 2020
New Revision: 356685
URL: https://svnweb.freebsd.org/changeset/base/356685

Log:
  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)

Modified:
  head/release/Makefile.vm

Modified: head/release/Makefile.vm
==============================================================================
--- head/release/Makefile.vm	Mon Jan 13 14:50:22 2020	(r356684)
+++ head/release/Makefile.vm	Mon Jan 13 16:31:00 2020	(r356685)
@@ -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" )