aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.vm
diff options
context:
space:
mode:
authorBrad Davis <brd@FreeBSD.org>2015-07-20 16:27:44 +0000
committerBrad Davis <brd@FreeBSD.org>2015-07-20 16:27:44 +0000
commita54bd5953b805b99146f5167a2294639667d860c (patch)
tree0e36c8ac0f7b55d3d666781fa28290d61f27800e /release/Makefile.vm
parent5a5c6e994c6c6bbfe71f0a96374d6036617887b7 (diff)
downloadsrc-a54bd5953b805b99146f5167a2294639667d860c.tar.gz
src-a54bd5953b805b99146f5167a2294639667d860c.zip
Add support for building VirtualBox Vagrant images.
Abstract the build, package and upload to handle building either type. Approved by: re (gjb)
Notes
Notes: svn path=/head/; revision=285722
Diffstat (limited to 'release/Makefile.vm')
-rw-r--r--release/Makefile.vm12
1 files changed, 8 insertions, 4 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm
index f6e7831445a7..b39d05520768 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -19,7 +19,8 @@ CLOUDWARE?= AZURE \
EC2 \
GCE \
OPENSTACK \
- VAGRANT
+ VAGRANT-VIRTUALBOX \
+ VAGRANT-VMWARE
AZURE_FORMAT= vhdf
AZURE_DESC= Microsoft Azure platform image
AZURE_DISK= ${OSRELEASE}.${AZURE_FORMAT}
@@ -32,9 +33,12 @@ GCE_DISK= disk.${GCE_FORMAT}
OPENSTACK_FORMAT=qcow2
OPENSTACK_DESC= OpenStack platform image
OPENSTACK_DISK= ${OSRELEASE}.${OPENSTACK_FORMAT}
-VAGRANT_FORMAT= vmdk
-VAGRANT_DESC= Vagrant Image
-VAGRANT_DISK= ${OSRELEASE}.${VAGRANT_FORMAT}
+VAGRANT-VIRTUALBOX_FORMAT= vmdk
+VAGRANT-VIRTUALBOX_DESC= Vagrant Image for VirtualBox
+VAGRANT-VIRTUALBOX_DISK= ${OSRELEASE}.vbox.${VAGRANT_FORMAT}
+VAGRANT-VMWARE_FORMAT= vmdk
+VAGRANT-VMWARE_DESC= Vagrant Image for VMWare
+VAGRANT-VMWARE_DISK= ${OSRELEASE}.vmware.${VAGRANT_FORMAT}
.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
. for _CW in ${CLOUDWARE}