From 4afe7cf500c71e278eba5b91192d024b3a211d85 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 22 Jan 2015 19:43:05 +0000
Subject: [PATCH] Rename the 'release' target to 'real-release', and add two
 targets, 'vm-release' and 'cloudware-release', that are invoked if
 WITH_VMIMAGES and WITH_CLOUDWARE are not empty.

This fixes an issue where 'make release' would not
build the cloud provider targets because CLOUDWARE was
not yet set. [1]

Move the WITH_VMIMAGES and WITH_CLOUDWARE targets to
Makefile.vm.

Note: There is no 'cloudware-install' target yet, since
some of the disk image names may need to be specific to
the provider, so this is probably best handled by the
build scripts.

Reported by:	cperciva [1]
MFC after:	1 month
X-MFC-with:	r277458
Sponsored by:	The FreeBSD Foundation
---
 release/Makefile    | 15 +++++++--------
 release/Makefile.vm | 10 ++++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index e462bf3533ac..a601921b3303 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -8,7 +8,10 @@
 #  memstick: Builds memory stick image (memstick.img)
 #  mini-memstick: Builds minimal memory stick image (mini-memstick.img)
 #  ftp: Sets up FTP distribution area (ftp)
-#  release: Build all media and FTP distribution area
+#  release: Invokes real-release, vm-release, and cloudware-release targets
+#  real-release: Build all media and FTP distribution area
+#  vm-release: Build all virtual machine image targets
+#  cloudware-release: Build all cloud hosting provider targets
 #  install: Invokes the release-install and vm-install targets
 #  release-install: Copies all release installation media into ${DESTDIR}
 #  vm-install: Copies all virtual machine images into ${DESTDIR}
@@ -275,15 +278,11 @@ ftp: packagesystem
 	mkdir -p ftp
 	cp *.txz MANIFEST ftp
 
-release:
+release:	real-release vm-release cloudware-release
+
+real-release:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
-.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
-	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS}
-.endif
-.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
-	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS}
-.endif
 
 install:	release-install vm-install
 
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 9b5f543dd659..17229bfb2792 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -109,3 +109,13 @@ vm-install:
 	cd ${DESTDIR}/vmimages && md5 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.MD5
 .endif
+
+vm-release:
+.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
+	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS}
+.endif
+
+cloudware-release:
+.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
+	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS}
+.endif