From owner-svn-src-projects@FreeBSD.ORG Fri Jan 16 17:40:31 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B617934F; Fri, 16 Jan 2015 17:40:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 87E461EF; Fri, 16 Jan 2015 17:40:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0GHeVAM088216; Fri, 16 Jan 2015 17:40:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0GHeVVG088214; Fri, 16 Jan 2015 17:40:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201501161740.t0GHeVVG088214@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 16 Jan 2015 17:40:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277253 - in projects/release-vmimage: release share/man/man7 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jan 2015 17:40:31 -0000 Author: gjb Date: Fri Jan 16 17:40:30 2015 New Revision: 277253 URL: https://svnweb.freebsd.org/changeset/base/277253 Log: Add 'list-vmtargets' target, which produces a list of all supported VM and cloud provider images. Add VHD_DESC, VMDK_DESC, QCOW2_DESC, RAW_DESC image descriptions. Format the output to make a bit more readable. Update release(7) to document the list-vmtargets target. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/Makefile.vm projects/release-vmimage/share/man/man7/release.7 Modified: projects/release-vmimage/release/Makefile.vm ============================================================================== --- projects/release-vmimage/release/Makefile.vm Fri Jan 16 17:07:35 2015 (r277252) +++ projects/release-vmimage/release/Makefile.vm Fri Jan 16 17:40:30 2015 (r277253) @@ -10,6 +10,11 @@ VMFORMATS?= vhd vmdk qcow2 raw VMSIZE?= 20G VMBASE?= vm +VHD_DESC= Azure, VirtualPC, Hyper-V, Xen disk image +VMDK_DESC= VMWare, VirtualBox disk image +QCOW2_DESC= Qemu, KVM disk image +RAW_DESC= Unformatted raw disk image + CLOUDWARE?= AZURE \ OPENSTACK AZURE_FORMAT= vhdf @@ -65,9 +70,18 @@ vm-image: vm-cloudware: ${CLOUDTARGETS} +list-vmtargets: list-cloudware + @${ECHO} + @${ECHO} "Supported virtual machine disk image formats:" +.for FORMAT in ${VMFORMATS:tu} + @${ECHO} " ${FORMAT:tl}: ${${FORMAT}_DESC}" +.endfor + list-cloudware: .if !empty(CLOUDWARE) + @${ECHO} + @${ECHO} "Supported cloud hosting provider images:" . for _CW in ${CLOUDWARE} - @${ECHO} "${_CW:tu}: ${${_CW:tu}_DESC}" + @${ECHO} " ${_CW:tu}: ${${_CW:tu}_DESC}" . endfor .endif Modified: projects/release-vmimage/share/man/man7/release.7 ============================================================================== --- projects/release-vmimage/share/man/man7/release.7 Fri Jan 16 17:07:35 2015 (r277252) +++ projects/release-vmimage/share/man/man7/release.7 Fri Jan 16 17:40:30 2015 (r277253) @@ -406,6 +406,16 @@ See for valid format values .Pq requires version 20140927 or later . .El +.Pp +For a list of supported +.Va VMFORMATS +values +.Pq including cloud hosting provider formats +along with a brief description, run: +.Bd -literal -offset indent +cd /usr/src +make -C release list-vmtargets +.Ed .Sh CLOUD HOSTING MACHINE IMAGES The .Fx @@ -522,6 +532,12 @@ for implementation details. Displays the list of valid .Va CLOUDWARE values. +.It Cm list-vmtargets +Displays the list of valid +.Va VMFORMAT +and +.Va CLOUDWARE +values. .El .Pp Major subtargets called by targets above: