diff options
author | Glen Barber <gjb@FreeBSD.org> | 2014-10-29 14:57:30 +0000 |
---|---|---|
committer | Glen Barber <gjb@FreeBSD.org> | 2014-10-29 14:57:30 +0000 |
commit | 6513e474ac5b1450691119b31343805f1d1266fc (patch) | |
tree | 2119f0e84ed1a204bb7f7b6c967ffcdf8453f18a /release/Makefile | |
parent | 2a382033b5c379d4d57f4030f6045bbd5527a1e9 (diff) | |
download | src-6513e474ac5b1450691119b31343805f1d1266fc.tar.gz src-6513e474ac5b1450691119b31343805f1d1266fc.zip |
Move virtual machine / cloud provider targets and
options from release/Makefile to their own Makefile.
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/projects/release-vmimage/; revision=273823
Diffstat (limited to 'release/Makefile')
-rw-r--r-- | release/Makefile | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/release/Makefile b/release/Makefile index 8a517f810243..5c425e48f0af 100644 --- a/release/Makefile +++ b/release/Makefile @@ -97,12 +97,6 @@ IMAGES+= memstick.img IMAGES+= mini-memstick.img .endif -VMTARGETS= vm-base vm-image -VMFORMATS?= vhd vmdk qcow2 raw -VMSIZE?= 20G -VMBASE?= vm -AZURECONF?= ${.CURDIR}/tools/azure.conf - CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES} .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) . for I in ${IMAGES} @@ -112,22 +106,7 @@ CLEANFILES+= ${I}.xz .if defined(WITH_DVD) && !empty(WITH_DVD) CLEANFILES+= pkg-stage .endif -.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) -CLEANFILES+= ${VMBASE}.img -. for FORMAT in ${VMFORMATS} -CLEANFILES+= ${VMBASE}.${FORMAT} -. endfor -.endif CLEANDIRS= dist ftp release bootonly dvd -.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) -CLEANDIRS+= ${VMTARGETS} -.endif -.if exists(${.CURDIR}/${TARGET}/mk-azure.sh) -CLEANFILES+= ${OSRELEASE}.vhd \ - ${OSRELEASE}.vhd.raw \ - azure.img -CLEANDIRS+= vm-azure -.endif beforeclean: chflags -R noschg . .include <bsd.obj.mk> @@ -324,32 +303,4 @@ install: ${DESTDIR}/vmimages/CHECKSUM.MD5 .endif -vm-base: -.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) -. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \ - ${VMBASE}.img ${WORLDDIR} ${.OBJDIR}/${.TARGET} ${VMSIZE} -. endif -.endif - touch ${.TARGET} - -vm-image: vm-base -.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) -. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) -. for FORMAT in ${VMFORMATS} - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \ - ${VMBASE}.img ${FORMAT} ${VMBASE}.${FORMAT} -. endfor -. endif -.endif - touch ${.TARGET} - -vm-azure: -.if exists(${.CURDIR}/${TARGET}/mk-azure.sh) - env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} AZURECONF=${AZURECONF} \ - ${.CURDIR}/${TARGET}/mk-azure.sh ${.TARGET} azure.img \ - ${WORLDDIR} ${.TARGET} ${VMSIZE} ${OSRELEASE}.vhd -.endif - touch ${.TARGET} +.include "${.CURDIR}/Makefile.vm" |