git: fcbeeb5ff456 - main - release/Makefile.vm: Garbage collect unused bits

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=fcbeeb5ff456b2f21d19d4fc6221774b512e30b7

commit fcbeeb5ff456b2f21d19d4fc6221774b512e30b7
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2023-09-09 00:49:35 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2023-09-28 22:18:46 +0000

    release/Makefile.vm: Garbage collect unused bits
    
    The cw*-package targets were introduced in February 2015 as part of
    adding support for building GCE images; but GCE support was reworked
    in June 2015 and the cw*-package targets were in fact never used.
    Remove them.
    
    The *_DISK variables were introduced in February 2015 as part of
    adding the cloudware-install target; this was removed in May 2016 as
    the cloudware images are published via the respective cloud systems
    and not published as disk images via the FreeBSD FTP site.  As such,
    the *_DISK variables are not unused; remove them.
    
    releng/14.0 candidate.
    
    Discussed with: gjb
    Reviewed by:    imp
    MFC after:      5 days
    Sponsored by:   https://www.patreon.com/cperciva
    Differential Revision:  https://reviews.freebsd.org/D41789
---
 release/Makefile.vm | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index ad09f3ff6602..befa9625fefb 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -26,35 +26,27 @@ CLOUDWARE?=	BASIC-CI \
 AZURE_FORMAT=	vhdf
 AZURE_FSLIST=	ufs zfs
 AZURE_DESC=	Microsoft Azure platform image
-AZURE_DISK=	${OSRELEASE}.${AZURE_FORMAT}
 BASIC-CI_FORMAT=	raw
 BASIC-CI_FSLIST=	ufs
 BASIC-CI_DESC=		Image for CI
-BASIC-CI_DISK=	${OSRELEASE}.${BASIC-CI_FORMAT}
 EC2_FORMAT=	raw
 EC2_FSLIST=	ufs zfs
 EC2_DESC=	Amazon EC2 image
-EC2_DISK=	${OSRELEASE}.${EC2_FORMAT}
 GCE_FORMAT=	raw
 GCE_FSLIST=	ufs zfs
 GCE_DESC=	Google Compute Engine image
-GCE_DISK=	disk.${GCE_FORMAT}
 OCI_FORMAT=	qcow2
 OCI_FSLIST=	ufs
 OCI_DESC=	Oracle Cloud Infrastructure image
-OCI_DISK=	${OSRELEASE}.${OCI_FORMAT}
 OPENSTACK_FORMAT=qcow2
 OPENSTACK_FSLIST=	ufs
 OPENSTACK_DESC=	OpenStack platform image
-OPENSTACK_DISK=	${OSRELEASE}.${OPENSTACK_FORMAT}
 VAGRANT-VIRTUALBOX_FORMAT=	vmdk
 VAGRANT-VIRTUALBOX_FSLIST=	ufs
 VAGRANT-VIRTUALBOX_DESC=	Vagrant Image for VirtualBox
-VAGRANT-VIRTUALBOX_DISK=	${OSRELEASE}.vbox.${VAGRANT_FORMAT}
 VAGRANT-VMWARE_FORMAT=	vmdk
 VAGRANT-VMWARE_FSLIST=	ufs
 VAGRANT-VMWARE_DESC=	Vagrant Image for VMWare
-VAGRANT-VMWARE_DISK=	${OSRELEASE}.vmware.${VAGRANT_FORMAT}
 
 .for _V in TYPE BRANCH REVISION
 . if !defined(${_V}) || empty(${_V})
@@ -90,9 +82,7 @@ CLOUDTARGETS+=	cw-${_CW:tl}-${_FS}
 CLEANDIRS+=	cw-${_CW:tl}-${_FS}
 CLEANFILES+=	${_CW:tl}.${_FS}.img \
 		${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT} \
-		${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}.raw \
-		cw${_CW:tl}-package
-CLOUDPACKAGE+=	cw${_CW:tl}-package
+		${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}.raw
 ${_CW:tu}${_FS:tu}IMAGE=	${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}
 
 cw-${_CW:tl}-${_FS}: emulator-portinstall
@@ -114,17 +104,6 @@ CLEANFILES+=	${_CW:tl}.${${_CW:tu}_FORMAT}
 ${_CW:tu}IMAGE=	${_CW:tl}.${${_CW:tu}_FORMAT}
 cw-${_CW:tl}: cw-${_CW:tl}-${VMFS}
 	ln -f ${${_CW:tu}${VMFS:tu}IMAGE} ${${_CW:tu}IMAGE}
-
-cw${_CW:tl}-package:
-	@# Special target to handle packaging cloud images in the formats
-	@# specific to each hosting provider.
-.if exists(${.CURDIR}/tools/${_CW:tl}-package.sh)
-	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		${.CURDIR}/tools/${_CW:tl}-package.sh \
-		-D ${DESTDIR} -I ${${_CW}_DISK} -S ${WORLDDIR}
-.endif
-	touch ${.TARGET}
-
 . endfor
 .endif