Attachment #175072 for bug #201904




	@cp vagrant-${PROVIDER}.vmdk ${PROVIDER}/vagrant.vmdk
. if ${PROVIDER} == "virtualbox"
	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}"}' > metadata.json)
	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf Vagrantfile vagrant.vmdk)
. elif ${PROVIDER} == "vmware"
	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}_desktop"}' > metadata.json)
	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx Vagrantfile vagrant.vmdk)
. endif

CLEANFILES+=	vagrant-do-upload-${PROVIDER}


virtualbox/box.ovf: ${.CURDIR}/scripts/box.ovf
	cp ${.ALLSRC} virtualbox/
	cp ${.CURDIR}/scripts/Vagrantfile virtualbox/

vmware/vagrant.vmx:
	@(cd vmware && echo '.encoding = "UTF-8"' > vagrant.vmx)

Line 0 Link Here

(-)release/scripts/Vagrantfile (+5 lines)
	1	Vagrant::Config.run do \|config\|
	2	config.vm.base_mac = "080027D14C66"
	3	config.ssh.shell = "sh"
	4	config.vm.guest = :freebsd
	5	end

Return to bug 201904

Lines 63-72 Link Here

(-)release/Makefile.vagrant (-2 / +3 lines)
63	@cp vagrant-${PROVIDER}.vmdk ${PROVIDER}/vagrant.vmdk	63	@cp vagrant-${PROVIDER}.vmdk ${PROVIDER}/vagrant.vmdk
64	. if ${PROVIDER} == "virtualbox"	64	. if ${PROVIDER} == "virtualbox"
65	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}"}' > metadata.json)	65	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}"}' > metadata.json)
66	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf vagrant.vmdk)	66	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json box.ovf Vagrantfile vagrant.vmdk)
67	. elif ${PROVIDER} == "vmware"	67	. elif ${PROVIDER} == "vmware"
68	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}_desktop"}' > metadata.json)	68	@(cd ${.OBJDIR}/${PROVIDER} && echo '{"provider":"${PROVIDER}_desktop"}' > metadata.json)
69	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx vagrant.vmdk)	69	@(cd ${.OBJDIR}/${PROVIDER} && tar -czf ../${VAGRANT_TARGET}.${PROVIDER}.box metadata.json vagrant.vmx Vagrantfile vagrant.vmdk)
70	. endif	70	. endif
71		71
72	CLEANFILES+= vagrant-do-upload-${PROVIDER}	72	CLEANFILES+= vagrant-do-upload-${PROVIDER}
Lines 85-90 Link Here
85		85
86	virtualbox/box.ovf: ${.CURDIR}/scripts/box.ovf	86	virtualbox/box.ovf: ${.CURDIR}/scripts/box.ovf
87	cp ${.ALLSRC} virtualbox/	87	cp ${.ALLSRC} virtualbox/
		88	cp ${.CURDIR}/scripts/Vagrantfile virtualbox/
88		89
89	vmware/vagrant.vmx:	90	vmware/vagrant.vmx:
90	@(cd vmware && echo '.encoding = "UTF-8"' > vagrant.vmx)	91	@(cd vmware && echo '.encoding = "UTF-8"' > vagrant.vmx)