From nobody Tue Oct 03 17:28:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S0Ptb1SQ8z4vm86; Tue, 3 Oct 2023 17:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S0Ptb12D8z4Kbr; Tue, 3 Oct 2023 17:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696354119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=udeVRkeWmxKtdYVjz1fwTe9OSiyxR5PTM2mjDyv/nuU=; b=uVrRM1QpGW7HgFTY5AWz3ixH6QsHYv5AfW5l2nzm/Ito8UjsEdLhy0bcdweGe1EjEv2fC7 OZkjaxSX0uAuEI4ZWAxYUtCmlKS5Zq0xB98UssUJrYFy4d8j4rWQXGJLDFBh81BJpWRLKu /4tYTrCeW5OkrfiOXb1xXupXmk08bKztdNA5A5avQkodxUQh1JK6pOYsmkZNec4n3SQopl C/A+w4+AZ1fjmABlkkj9fS/8YnssSoDU+gUOpMXagq2tB7+l51cUNs6rtZjjm2+QNCIDZX Rig3E7Er7vYc4PkQ298hxmzDYUILSA6Crnqxs0xG11juUesiqLf4REDTDMvwKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696354119; a=rsa-sha256; cv=none; b=v1zOj/dk6kV1oGM0uKch/MwziHOT3quFvBR+TniDCoqViwmQeASQLJuhjkHjdY6pDhYJXU FSQ+pOCVc64zBGlUSjdpjtWx93+kGnkIM/u5STVRMg+pBlROzODvZ0CHbNWqwEWevAKnOE lY8oWler63aW5wMcIVuzldAoqUMbSxOuLjfTSseAEyDrDUAxznS8E5GVWdjBAuQuSaOCVF bREtxAIc+QpPp+4ktEcsDEyl3gEjZzyRf9a7NjzhBQmxrzqftVNm2Jj2ROcwofX7QqjVHh ngYR+CGA4vM/x4OVTcaV2tV9tEIU+vQul4CBaM0o2EabPhQEzeQdd5q0VQeZpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696354119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=udeVRkeWmxKtdYVjz1fwTe9OSiyxR5PTM2mjDyv/nuU=; b=e5EFlJquz2vFSScmBUOFD6hbxgbKTyhqJ/0/1N8FQYuHLNjrJIJ31k9DRIgxUDMAmxLluX SjwhOeqy9z5EP22qIRiRvszB8p732loX+STL6lxQByG2n24gQfkYtWlv2yseKUOGcYZpwD ZD9c+zsy6qr2MgNYpSA2Wo7l4FBz6dj+7P4CzCdb5aJH2VPLsJbso46CfTPowByHdxJuqk URuWAmsBdwwpOueEeIAIvOiR8ujRZRKaGBs8wtiP2XAumFp9Jaa1WHwJAS3gDKiplv+xn9 TTW9IkhGPtQI3E9k8ylFZKhPzEemf0t1x08t5n+w2Jy2EyTbyWL/TsVUZhLTUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S0PtZ7242z13k6; Tue, 3 Oct 2023 17:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 393HScYi085485; Tue, 3 Oct 2023 17:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393HScnJ085482; Tue, 3 Oct 2023 17:28:38 GMT (envelope-from git) Date: Tue, 3 Oct 2023 17:28:38 GMT Message-Id: <202310031728.393HScnJ085482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b9013d75c853 - stable/14 - release/Makefile.vm: Garbage collect unused bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b9013d75c8531e1eaa993321a22eb7714af10f68 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b9013d75c8531e1eaa993321a22eb7714af10f68 commit b9013d75c8531e1eaa993321a22eb7714af10f68 Author: Colin Percival AuthorDate: 2023-09-09 00:49:35 +0000 Commit: Colin Percival CommitDate: 2023-10-03 17:28:17 +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 (cherry picked from commit fcbeeb5ff456b2f21d19d4fc6221774b512e30b7) --- release/Makefile.vm | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index fb00804a81ec..4041ae14e2f3 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -26,35 +26,27 @@ CLOUDWARE?= BASIC-CI \ AZURE_FORMAT= vhdf AZURE_FSLIST= ufs 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 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