From nobody Thu Sep 28 22:18:50 2023 X-Original-To: dev-commits-src-main@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 4RxSYk3WVZz4vggY; Thu, 28 Sep 2023 22:18:50 +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 4RxSYk2yMgz3Mlm; Thu, 28 Sep 2023 22:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695939530; 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=btKEhuAjL39mnkDGyJxZ/LHuKBUM/rSk6WhrU1IoH34=; b=OHq6yA8VIV3WhXHbe0we3lwB7e7L4Jlr27tA79/e5btmpu2FdL6iE4xOG5FZgjUIxpm90G C/kdNQgIajSC/+QGAQEoFWr+zLTy+2WDVpIiPiHwP97vbF/zLthPFjmVlj69IHJ0y1NrVN HG/b9T7ANFYYRebJPetS9FL0Z+5Md9S/fTv3ApBah5F0aZFJ77JkYWnkA+CrKyc5CE34Ht qBJm0/y7HHLTS/PNA1+QzHXYZBYLsgmTPFvkMx9b7vtwzcrf6sIi6NazYSeZ6ppr0WP/I+ xGZ7hkDnk0sY+Bb4L6bgR0bi/bjUfnR6btS3/Xeub76A6c8roWR5d5nnckpjVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695939530; a=rsa-sha256; cv=none; b=b6svqQ0BJOc6JPi1+4dV+ljI/AMhmsFIKi1R12uGVvRXNDWtENer7OHbOdKYIA3gU6cfIy +6gW+KxPHNoBL9/e2Q2GhIgrBIXP7SPZQAVnvZjNr3KqoOHoDq9BHERGwpTQjxLTs9uqsb iGA3t0ziExbV4wXeUBg0aJGZaLhikmL9bMGt3qR8w2OEtXExeBuYkZKi0hHK894scksfWY fUKF0C7oy5M8BCr4ZUm4m5kStn7XlkLw/bXpCO+rpfcy7N4fUmJB2FY19EHsBs6xEDDROp kS44bgML3J3lt5Pot2x4pZgzvrusq2u4rEegcgSkV1Wq9+ADtSA5efIHWkVBfA== 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=1695939530; 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=btKEhuAjL39mnkDGyJxZ/LHuKBUM/rSk6WhrU1IoH34=; b=Oy2iKxZJzk84HXgEZ9qKczqy4W4wpW10PNBtqjbPHyWbO6VZaOWtugiihtaKyYaDcijSUI RKf8rpoIUufzgSrl55EalaMWIVTw2BEBA33qJ9BW6k7KBgrtnD55v/Up8JzQA9ljlCaPKz 6JoUkrYc3Y7WfVcjyozWwSXID40UPEFFKcBI2vbYZiD2adl/5M4vKCXOOsA1qeVZ/K0/TL IvviLfePhEO0D7KI9dVqDEIgSxkct+OUQaJl99FDAQCMn74s2mILPba77PBvUA+yPHUBRf 4XXd8swgdSFNS2WnIj7YX7TcUzCSx32E77rv7EvwmWqkWP6WaAZ/nhK2w4TSpw== 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 4RxSYk20zwzfDm; Thu, 28 Sep 2023 22:18:50 +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 38SMIoAX056758; Thu, 28 Sep 2023 22:18:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SMIo8U056755; Thu, 28 Sep 2023 22:18:50 GMT (envelope-from git) Date: Thu, 28 Sep 2023 22:18:50 GMT Message-Id: <202309282218.38SMIo8U056755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: fcbeeb5ff456 - main - release/Makefile.vm: Garbage collect unused bits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fcbeeb5ff456b2f21d19d4fc6221774b512e30b7 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fcbeeb5ff456b2f21d19d4fc6221774b512e30b7 commit fcbeeb5ff456b2f21d19d4fc6221774b512e30b7 Author: Colin Percival AuthorDate: 2023-09-09 00:49:35 +0000 Commit: Colin Percival 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