From nobody Wed May 1 18:03:12 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 4VV4g507HPz5JnnD; Wed, 1 May 2024 18:03:13 +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 4VV4g46FWNz4T3y; Wed, 1 May 2024 18:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714586592; 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=oIeEu10IebCr7maPh8ThuZ1DOv7P0Hvz2+4PqPDaPBs=; b=jjF5H6jPW3Ep5WWvxnH74HYJANcVPWnQl30QBNsClchfG/zE2LNFcTMSyfQaBhgj6ZFImF +37stk1big/GZPVQMTjqd700u9wW822ZrjQwxSW56OSwTCF698GzJxu3nWGR4sJsUaZ54C wseAo7Oy4DsV5Lt20QiyzxklQHg/NuQGW/ijaUjNkbB01qga0F+cBxaGhHNDsPk8f63Hlz Cl1HdHqkl3KdxW9Toom1dkdjKqCJ6BR9ifB6l9b17ZpZlZvFYD0TN96NfdWbJh5BdU+4ZE 3X8npOpsQ/2p2J6GZN93b/7tVYY8au1B7UVu4VTLq9zGrubCN29Ld/EhtHlPng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714586592; a=rsa-sha256; cv=none; b=dvWHmJsdBz7ySmf6/I3M8+0A2qf5uMD6eQnLHKw71oxbAbl5tsEUyV4sb2QSSUIaHDABOn n/yjn0t54/mXJHEQ3ywoVKTlp5FfOlFseKcZUlcNLidj/W9Y8ux+yMQmOd1aSHqv/3SqRO z3aV/bGWaFeAFGVR0d0PHb/6Ccek7evqHZQpQ9seo0/0S6CteqGekv2voMa4NEBUFiT83H JWQecV5nrJojKYlug/gwSJKD93UyLDuXIPiQ9s63IVX3v1Bj6bIjaUegMfo3JXUBdZI+Ys D+xVNsk8cki7hYDjuOesRHwEiD9/MIN+mw9Th138Zfi8rgetUFI/nf5ugtjCfA== 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=1714586592; 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=oIeEu10IebCr7maPh8ThuZ1DOv7P0Hvz2+4PqPDaPBs=; b=Ftd0K194CXrqBlytgk3RWqwmB8gONhXSDnq1GM7nKaxTB7u0H+TMBmUjrL79x10TVOTHZ+ 8i3b48LjcbguIiV/WZR5JQAMb4VO/7e80XLi2917vlaOluEj0DHenTbIUxktjgx/usi3FT el4A2UooA0eki1AVx7fBpIVieWUxUs0LqFuveAqBrIISb5KEKwVB5xSGRTUfPqoWJplp3K u6zPGRDJsCkuuhn9BE5lu8pKvwP+izVYCwefupdsuBgZ3rmWQ807wyU/p9B0cWV+AP9wXW sOXC7lI9dAiBkWMS3ka1IJAa6t2Nv1Y8zp/Jwi1CxFmWMGmLdNblp1cJk2xHAA== 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 4VV4g45rPyzTfT; Wed, 1 May 2024 18:03:12 +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 441I3CSC013937; Wed, 1 May 2024 18:03:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 441I3CW9013934; Wed, 1 May 2024 18:03:12 GMT (envelope-from git) Date: Wed, 1 May 2024 18:03:12 GMT Message-Id: <202405011803.441I3CW9013934@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: f4b08097d8e2 - main - release: Stage non-UFS images in vm-images-stage 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: f4b08097d8e274e1a8526d864c31462ea42d9e9f Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f4b08097d8e274e1a8526d864c31462ea42d9e9f commit f4b08097d8e274e1a8526d864c31462ea42d9e9f Author: Colin Percival AuthorDate: 2024-05-01 17:56:51 +0000 Commit: Colin Percival CommitDate: 2024-05-01 18:02:49 +0000 release: Stage non-UFS images in vm-images-stage When the VM image building code was updated to support building non-UFS images, the vm-images-stage target was not updated to install those newly built images to the FTP site. As a result, we have been sending weekly snapshot announcements since August claiming that ZFS VM images are available when they are not in fact present anywhere publicly accessible. Fixes: 32ae9a6b3937 "release: Build UFS and ZFS VM images" Reported by: Michael Dexter MFC after: 5 days --- release/Makefile.mirrors | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index cbc5cd768e28..591fd85b29ea 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -193,6 +193,16 @@ vm-images-stage: cd ${VM_DIR}/Latest && \ ln -s ../${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ ${OSRELEASE}.${VMFORMAT}.xz +. for FS in ${VMFSLIST} + cd ${RELEASEDIR}/vmimages && \ + mv ${OSRELEASE}-${FS}.${VMFORMAT}.xz \ + ${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ + ${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz + cd ${VM_DIR}/Latest && \ + ln -s ../${BUILDDATE}/${OSRELEASE}-${FS}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ + ${OSRELEASE}-${FS}.${VMFORMAT}.xz +. endfor . endfor cd ${RELEASEDIR}/vmimages && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} @@ -212,6 +222,10 @@ vm-images-stage: . for VMFORMAT in ${VMFORMATS} cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}.${VMFORMAT}.xz \ ${VM_DIR}/Latest/${OSRELEASE}.${VMFORMAT}.xz +. for FS in ${VMFSLIST} + cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${FS}.${VMFORMAT}.xz \ + ${VM_DIR}/Latest/${OSRELEASE}-${FS}.${VMFORMAT}.xz +. endfor . endfor . for CHECKSUM in ${CHECKSUM_FILES} cp -p ${RELEASEDIR}/vmimages/CHECKSUM.${CHECKSUM} \