diff options
| author | gjb <gjb@FreeBSD.org> | 2015-01-22 19:43:05 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-01-22 19:43:05 +0000 |
| commit | a74cf6ece6a4ccf2bb4ff12aaa01aea80ebd1aac (patch) | |
| tree | 4e9d7c0259848b385217a395d4e802aa5af2c495 | |
| parent | 8ef50ae63c03a35f988a15bd31fc2d584e5a3331 (diff) | |
| download | FreeBSD-src-a74cf6ece6a4ccf2bb4ff12aaa01aea80ebd1aac.zip FreeBSD-src-a74cf6ece6a4ccf2bb4ff12aaa01aea80ebd1aac.tar.gz | |
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
| -rw-r--r-- | release/Makefile | 15 | ||||
| -rw-r--r-- | release/Makefile.vm | 10 |
2 files changed, 17 insertions, 8 deletions
diff --git a/release/Makefile b/release/Makefile index e462bf3..a601921 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 9b5f543..17229bf 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 |
