From nobody Wed May 8 06:59:25 2024
X-Original-To: dev-commits-src-branches@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 4VZ5bx2Nnkz5KTJd;
Wed, 08 May 2024 06:59:25 +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 4VZ5bx1vbWz4k81;
Wed, 8 May 2024 06:59:25 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1715151565;
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=IGH3yRsqo8VRT0Kk8/mHUgHVbISDSOnFuhMGiumwd48=;
b=RBz52Z3JJsWrcOunEfH9vi90skSaILlihST7L+/YXKHJgTzyBD79UI4VN1TorSWVHqKczi
chLZ+Enz6SaGjMiNyFxkoE+HvD/xUiUZmyRhO7rMPZSjdiQhoVVuxfoN3WcOxp57Isvbef
WyylEwGRBmgtZzgWjA/KxpHYpleb9VoE5QWMxSGN6LyCchl8SgLqLohcEb9MQO5oJW39ek
FNW+EkKuA8oBPUdY+zPrDjW6KeDaNbHAMXZfGR8yEoE/Ogp5uWB11a36zbOgRaIjd3U9L4
DsaXQI7BPEJoqPRHXnuHPs8RwC9WN3VnyQMvzbfVkU3moKWwhPy6lIZjECaknQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715151565; a=rsa-sha256; cv=none;
b=Ch6v98te7kxt6YK8sb3PL+y0ViRcdmvoB5o8mK3PLJP1LB7Tm+K7UkwkFWlWEqgN74PaRn
e6a2M01XojJFFWvjOgOhTIzlkrwHqAx8fosCqJxxPR0c59qL4HZRLPhF2aj2prKfGmwT/4
GwX2Ksq9YwCg3a9A/l0a+tHW7/X17F/ixHhocsViw/UGE2kvAa4d0lA3AaIuftMpbv6ylQ
/pllmmk/E98EgZMwe/2C6hMXaDBWKMVVBbCyPKNuowpRSVoF08HKjAzNx6F4UzIep6kQrw
1EfzvPjQp9wCuhbmEykCSd53VLNislFtI5y9d9YYhxvDYd/oxOM52x3UZfZbdQ==
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=1715151565;
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=IGH3yRsqo8VRT0Kk8/mHUgHVbISDSOnFuhMGiumwd48=;
b=ifqMIZkdNZq9Z+KisLg4cqq8BB1VsK/lRsnv7GLD2LoCmHTsgRuObh/oBrOr7ZEFJTRd3n
1xoi6Y8RHg6lynaJVBTCshcUXTA6yzp3VcE4jSUQTMpSyzgereUYPhgY3sxsHrVNNLs7gD
em7/Flgumc0Cv4ThBisiLsXFeowclE0Jf3OzyXwkt0liBX/2GG0ZCh2VhlEes64wjwtDn0
YM3gfTRAldDESfoTcUxgUGpadPyjjIQMNAnRLFW0CZs9smX5uxtjjMtikzJ8kTumWfvFIE
q/2ce6V6L6JonoVO62j0/BEdJqJpQC+ncR3sW29D9w/aVbPvzsF/Fqa5mHWlMg==
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 4VZ5bx1WcgzFRQ;
Wed, 8 May 2024 06:59:25 +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 4486xPqI053064;
Wed, 8 May 2024 06:59:25 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4486xPcB053062;
Wed, 8 May 2024 06:59:25 GMT
(envelope-from git)
Date: Wed, 8 May 2024 06:59:25 GMT
Message-Id: <202405080659.4486xPcB053062@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Colin Percival <cperciva@FreeBSD.org>
Subject: git: 3c1f3cfdbbfb - stable/14 - release: Stage non-UFS
images in vm-images-stage
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-branches@freebsd.org
Sender: owner-dev-commits-src-branches@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: 3c1f3cfdbbfb309d80645f413be6474f6c82eda6
Auto-Submitted: auto-generated
The branch stable/14 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=3c1f3cfdbbfb309d80645f413be6474f6c82eda6
commit 3c1f3cfdbbfb309d80645f413be6474f6c82eda6
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-05-01 17:56:51 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-05-08 06:59:05 +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
(cherry picked from commit f4b08097d8e274e1a8526d864c31462ea42d9e9f)
---
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} \