From nobody Wed Jun 26 00:35:18 2024 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 4W82m645yyz5QJX7; Wed, 26 Jun 2024 00:35:18 +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 4W82m62RhLz4llj; Wed, 26 Jun 2024 00:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719362118; 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=vZDqTOkTQaAqCZ/xETWa52Uj2DcIMHrsblz/G9Y5FLM=; b=ZmhqK3eE7xhGd2VrskKucucrg6xEAJSADw1OSb0bHSDowyxqGrf93tWTLRRFAz7nUpbM7K mJIvPBOrPo9yfW++/pHuFLbuywIgGGaTm64Hg0pznaYxC+GKu8F8r+JiC5qCwVs3cvelAZ bk/2vpGGJVxsAaytTnTC7Ndv/p7+mZG6NKaaj8XrpNw0i0ZuL+TjK4+iaaht3YtiqmeUaW BOrWcdSpxucZhGWbqvDzZSW3TYs8GDLVg3d+G+qOUfYhNMOcoJvFZSFUoObJCJIEBpgg3z +ssh1fu9LOTALwpGCQ3A84m374Eqpg/7gNfztKWjD8rHWSxD0G8TbkE4MB+wCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719362118; a=rsa-sha256; cv=none; b=rEft/35V0tVaKC1C5Svcm8imVFTT+nMsC/d3SWUzM8l0UXAWCu92ep0jkWx/oDyHw7BEhZ Gs1qQqu392s6SLnrNlPGpIQEHPENWGdQD1AwgSNaNSfaixzpey6EUFsZMJz3PJXWHzNF5h 5Ytziv4oj274A0BUeWlYTa9gJHt5aK2RnLJF02WyR6xpJoRJvyn3oIbkcvv6sJa+mYS02x D0trXydvLx+bgfuvzg2IyrqrvfgVnF770rxCWvkDuhfERznupr9fNQcydRFdyIlaKnOqqn GUXdpKbAZuLWy3ztA8bF6qIjTkEbT2TbeIzyXoHaOPwt2kGnu24neaDWQZw0mQ== 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=1719362118; 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=vZDqTOkTQaAqCZ/xETWa52Uj2DcIMHrsblz/G9Y5FLM=; b=J0DKO7whCAitnZTSv12ovUpOhgsPqtSuakyRevxWEHtOXcptxDLkjC+hz4QHkikPEc4+Gz hjORgtcpz2emDTqWTfVthhB4ueTL6Nw58rRmu3mKE+yVOJPV3/kdSQGBkhFZdh/HdQcOd/ oq3ilPTfU0RyLiq9co6E0ZCDSFeaAhqZo3SzNFk82bNbWuejRVwLXnp9C55TCE+RDSPXVX 1vK/WPXTWY3r/LpLxMAKIHhOYzwqyG15lyVZvvvSxw4hB9os2KeXh6RaV72SteQ8xcVSvc t7u1cyRPtwFmS5BAzlhVnI0heDnWqvy578XBBuzEISE+iHmUkzTRXV1gDK1Rmw== 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 4W82m61mbbzNZ9; Wed, 26 Jun 2024 00:35:18 +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 45Q0ZIjC030716; Wed, 26 Jun 2024 00:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45Q0ZIHN030713; Wed, 26 Jun 2024 00:35:18 GMT (envelope-from git) Date: Wed, 26 Jun 2024 00:35:18 GMT Message-Id: <202406260035.45Q0ZIHN030713@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: 443a4ce9d401 - stable/14 - release: Don't publish CW if !WITH_CLOUDWARE 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 443a4ce9d401db290a552558787765e413b34484 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=443a4ce9d401db290a552558787765e413b34484 commit 443a4ce9d401db290a552558787765e413b34484 Author: Colin Percival AuthorDate: 2024-06-21 00:38:46 +0000 Commit: Colin Percival CommitDate: 2024-06-26 00:34:43 +0000 release: Don't publish CW if !WITH_CLOUDWARE If WITH_CLOUDWARE is not set, we didn't build BASIC-CLOUDWARE; don't try to install it into the /VM-IMAGES/ directory as part of ftp-stage. Fixes: 4771c2e9d1c7 "release: Publish non-uploaded cloudware bits" MFC after: 6 days (cherry picked from commit 836f00ebb96ac343e0f8a68ea264d2d330198488) --- release/Makefile.mirrors | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index fd233e7abdb6..1888f86d3002 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -209,10 +209,11 @@ vm-images-stage: ${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor -. for CW in ${CLOUDWARE} -. if ${CW} == BASIC-CLOUDINIT -. for VMFORMAT in ${${CW}_FORMAT} -. for FS in ${${CW}_FSLIST} +. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} cd ${RELEASEDIR}/vmimages && \ mv ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz @@ -221,10 +222,11 @@ vm-images-stage: cd ${VM_DIR}/Latest && \ ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor . endfor -. endfor -. endif -. endfor +. endif +. endfor +. endif cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} cd ${RELEASEDIR}/vmimages && \ @@ -248,16 +250,18 @@ vm-images-stage: ${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz . endfor . endfor -. for CW in ${CLOUDWARE} -. if ${CW} == BASIC-CLOUDINIT -. for VMFORMAT in ${${CW}_FORMAT} -. for FS in ${${CW}_FSLIST} +. if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) +. for CW in ${CLOUDWARE} +. if ${CW} == BASIC-CLOUDINIT +. for VMFORMAT in ${${CW}_FORMAT} +. for FS in ${${CW}_FSLIST} cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz \ ${VM_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz +. endfor . endfor -. endfor -. endif -. endfor +. endif +. endfor +. endif . for CHECKSUM in ${CHECKSUM_FILES} cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \ ${VM_DIR}/Latest/CHECKSUM.${CHECKSUM}