From nobody Fri Jun 21 00:41:18 2024 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 4W4z7L641Wz5P5L1; Fri, 21 Jun 2024 00:41: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 4W4z7L3RWMz4QYs; Fri, 21 Jun 2024 00:41:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718930478; 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=FRvAuYzAx7xz/N3zP50ED3dV8cxoVv9GAGZ6Mxr+qWE=; b=sAfWudrwYWt1Md0/BMyX0i956y5+YO62/IChjfBfJFK3+chwn9anfqyNSWLJG/33aEr/JR 3G+FQL9T0qr5pg3Q3LXjIUds+zU5zXygHipZzJKlI7fkIVRn6/kCLmJqsp+R0hh2tNeVo0 +p9SydVQfM9ETNbT2WXuvgmWgoYXTc64gq98xsN+rGJNzQHcUULypvLRjdLgyxtKv+DN7L HYF3uN8yu5P4TOij1fdv5u8y0WqbwnM/wh04pp80m6S7UJtEt+8V14CRywEYdJN/br6xAC ZeKPslDocmuAuwdda9MqBC9lU2e7AYFqpv6u4mSxj2r0R0HmQqILdi4ndA1p6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718930478; a=rsa-sha256; cv=none; b=FLgdyNTK5SMriSbjW6GUpdjFM5KDX0yx24bLoJ8DlFuBu3K5Jv27CS+cXa7Dcu0cEkVO9i OOe/PXmx5BeWGICSYKqcL2ySpmCk5Pzk2+3eqbr3GHxVaWHuIXwjwK7IEdLH659/gV4jAq DJ4gePtgefmqlVcwQgXJnAIdWpZI/MKsNiclPS0AuHpm6o3eoRYOgrOTnNboJD4Q5Tx39W I+ZH4aP6JXLJz3hcD3wT2Ze55btYHEivi+QMCz6jVlqXSBb6KxgUBCH/WQuvQE8kA7SBXm qka9twiJJoQfmyIGN3twEqJbuL1Tq1uqL99Bf2tNNpHFSU0Bg5ieg/XBCHJpNg== 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=1718930478; 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=FRvAuYzAx7xz/N3zP50ED3dV8cxoVv9GAGZ6Mxr+qWE=; b=ubIo6TTJWobUrZvnkkrq8vC7TopIy/8oXcquaXCn0FiqubaGEK3+WpRfk+8npA4YEM5uuu jDWedFlUzC7GeKSHhS4R4IWUon/oEBl9jlqJv91ZVradK4WEWF39Eq80PkYA9zKHAOkSuD f3CoCsXJxXARI8dDfv+ZL2wffDaygsCyvZ+7rgSHKqxfNrCZ+L18cFj7WhUAy1ilDpLnG1 +EYc6GbPMBK2l8Bg0BzBZh3e+36CM7Z6U6N7LWvVJ0fhKWsADeIBam5qA/LWZnQAea/ddu C1Nzzxc4ROWh/hjDiyi3gD9ojIE55WeRdUgQrcO9C/XnnzyK2q4jMucv3XuQ/Q== 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 4W4z7L32vczn5c; Fri, 21 Jun 2024 00:41: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 45L0fI7M052022; Fri, 21 Jun 2024 00:41:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45L0fIcP052019; Fri, 21 Jun 2024 00:41:18 GMT (envelope-from git) Date: Fri, 21 Jun 2024 00:41:18 GMT Message-Id: <202406210041.45L0fIcP052019@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: 836f00ebb96a - main - release: Don't publish CW if !WITH_CLOUDWARE 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 836f00ebb96ac343e0f8a68ea264d2d330198488 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=836f00ebb96ac343e0f8a68ea264d2d330198488 commit 836f00ebb96ac343e0f8a68ea264d2d330198488 Author: Colin Percival AuthorDate: 2024-06-21 00:38:46 +0000 Commit: Colin Percival CommitDate: 2024-06-21 00:41:14 +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 --- 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}