aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.vm
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-01-22 19:43:05 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-01-22 19:43:05 +0000
commit4afe7cf500c71e278eba5b91192d024b3a211d85 (patch)
tree4e9d7c0259848b385217a395d4e802aa5af2c495 /release/Makefile.vm
parente9c93198bc886d4c41c8bfb4e732800b626e8bb6 (diff)
downloadsrc-4afe7cf500c71e278eba5b91192d024b3a211d85.tar.gz
src-4afe7cf500c71e278eba5b91192d024b3a211d85.zip
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
Notes
Notes: svn path=/head/; revision=277536
Diffstat (limited to 'release/Makefile.vm')
-rw-r--r--release/Makefile.vm10
1 files changed, 10 insertions, 0 deletions
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