From nobody Thu Oct 5 15:54:32 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 4S1bj43cLdz4vrn5; Thu, 5 Oct 2023 15:54:32 +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 4S1bj431q3z3LWT; Thu, 5 Oct 2023 15:54:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696521272; 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=nve0cm/eqo183xAr46wzmY00uqxTOLK/Akaa9hg2Z0Y=; b=EkaGKWUqgd89iIjulgX8JBEhZDs9XteFkVKfLUH7DBUryhYq408+1p4eWllyrv89Ie1qsZ nqx+RHZx2QMafKKm625Ur21799VIETmZbGaUK614Jcu7j8na30mCgyyi4N6R15PagYcpH3 mJfaEpmBiTqfvKyJncvSefHlQfTgHYCX4YMEfr+R6SzeYROD7Pns64KCGC5nRZ9Znupo4s L4cvWbMnnOxrFf1hEzFD9OAOFlIKH+NimRmtrfEQVhybE/E1oI1bfAEy1FlZI+cYRpa0mo dYrFGxlBNC4PkVVG//edzlJcixNGCnIuYnHjyX0pMphkmIjbE/zuY6XFs+1BZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696521272; a=rsa-sha256; cv=none; b=bBAftkeArskALDdUdRwpt+VgLzjHMZlMMkRLHIzcL4rPpLdPNvS8slyIPKJc5wcBzm7vxN NdPIlzmM/uVHeXm6pC/mkM5F45YFvZ82PoLgL+o1whQUZoEGMwYJVw+uEl6vvn6BoStiwN +/7i8VUVwnPPFvdlPNPu7NqpblLF6LC6x/7XDey3M866Mt3QVzsd8T4kC18HB2Q96o19sw gcUcBNFBvj1GvH4aG/fOJuUgW8dYvIt6mnOZiw6cczo1UFlVVTgeYxV0VUIEOuLIXQxOzt KZTuhLIqPfIZuP9SII/4GIDya5GpJJR74QFQ7ARnDAWycCL5lnKK8LoJdxNc0w== 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=1696521272; 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=nve0cm/eqo183xAr46wzmY00uqxTOLK/Akaa9hg2Z0Y=; b=nuQtDLV8lV1nRUb+qIXNK8u9k/Hq961mWhsJUM2sScDkyI2tbyht1LV/tn64hTZ9XtyF5U ewASoui4+cBX/zIzKGI6y6nuXwV/saNhiYJiG3g1WSsOG0b5tpJSd0Q3fewZkju2uLlOst FO/8Nc2CJuNYZ2En1/9qW3stlEBJIQ2UL01/zpnvrXHWNn0Axp+oXZa5du7H00eFC47ZSu Y0snvDQzK9an8/2hOx+z4yNBoWckbFOX0L5pA2cAY/zoYEY13DSpMHxM072sbiTJM1a27j +vmAWMNXBUjXdNhTFPO0ivdtMQm1C5j4R0lVi+ckbRp0KEi1x40BA/NqqrEI2Q== 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 4S1bj427Tsz1QPF; Thu, 5 Oct 2023 15:54:32 +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 395FsWkb046613; Thu, 5 Oct 2023 15:54:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395FsWEe046610; Thu, 5 Oct 2023 15:54:32 GMT (envelope-from git) Date: Thu, 5 Oct 2023 15:54:32 GMT Message-Id: <202310051554.395FsWEe046610@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: 84d45b29dd3f - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 84d45b29dd3f588308c63a52fd1e92b03f50b002 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=84d45b29dd3f588308c63a52fd1e92b03f50b002 commit 84d45b29dd3f588308c63a52fd1e92b03f50b002 Author: Colin Percival AuthorDate: 2023-09-09 00:49:35 +0000 Commit: Colin Percival CommitDate: 2023-10-05 15:54:03 +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. Approved by: re (gjb) Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41789 (cherry picked from commit fcbeeb5ff456b2f21d19d4fc6221774b512e30b7) (cherry picked from commit b9013d75c8531e1eaa993321a22eb7714af10f68) --- 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