aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
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
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')
-rw-r--r--release/Makefile15
1 files changed, 7 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