From nobody Fri Jun 21 21:42:15 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 4W5W6H6JWhz5PNGk; Fri, 21 Jun 2024 21:42:15 +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 4W5W6H3qKyz4cpY; Fri, 21 Jun 2024 21:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719006135; 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=px5UPKB3thpPpDE+imASowG4AAIvoy0dwMPFrYxFnd0=; b=XfyCL9HmHc7RkJue7ezkT6YRClB2a1qxx8OYrOkSs/O4+t/4m7Tz0fGfxmBtTqsuPyIuZT UI0VUfpCuQX8hcaqatg3qQzq93iz9HIIH2gWAPelDACsd0SFVOM4uFdvChdhjy5b9FyRO/ wgItT5wImfmWJq5oeHjej1dDOlqfwgeUTcViQ/5Z5o6aCkS0NOExPo9xBYS7kwyctGpPfk EkBuzZpW/YMjp12ptx6uuHSl10rKmWuzIpEhVVZ/qp6K/gLKAdLvhbkXy1nDFZhCo59rCD 5lfub8VPK15afuM/udh0cOLFD7RBmBU0eif/i8/UWlNiFAJIJq47E0h9zjFb2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719006135; a=rsa-sha256; cv=none; b=n+dmE/xQx9nt0/Wo5+CnEldZ/UYpBKGCUO66QZhzbR/CEsFfjpH6Z35wNgOz08rxaH1Q3l 8ZiumfjKHThlIFqmnsfsrgCnVp0CLz+ggr2hzKeyTz4JnHki7HOw/VDukW1y6QoMmxUqal gS6PfLz+991sF0h/+9Ea1Rw0uBPAw7FF9HuDXTG0qx7E94DhJsgykFO0YtMHXOvgeKTBd/ 7zAj5uehRwgYIXQXkC7dzTxgCeMrpIBpW6nzcGloFQKFJApWv6r6suIhmCVXL6u0T+wWJ6 K/mtO53L27bJ8CSvgfJ3KdouOMiJOPipgwqPy5EZMaclpstf7PiW+HEwlj9uWw== 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=1719006135; 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=px5UPKB3thpPpDE+imASowG4AAIvoy0dwMPFrYxFnd0=; b=rhfS6El26s4pduhY5IVhSWP58oQB58We5lATobsyk5+9S4WQsERvezs8xWxU4Tbuevnvpn mDxmROB3dehOJgcyfcKV/PRGgFmKj/vPYyL3QbWkbhncXz5qwMse08qXCdQAalLnVS7ACQ B4TPEbcyS1SxFXZsQU6iZZvFPTfx+Ntd7XqGoZcMAbn3Gvf6FOq4JeSdPEXciOfLnTfWNk EmLz5MGEZRnx8YQHvNZJCgyPOhXWR8DORoMLYxfOyxSC2aiF+ZchFwGvTa9RQdjaG2bbGd zMiPNsSqIfHt4GSwUuwTgMuPrBdJPm/kYAGQNAMfMo04P3pMpZKHeHyDarz04Q== 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 4W5W6H2M4mzPxk; Fri, 21 Jun 2024 21:42:15 +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 45LLgF7W092170; Fri, 21 Jun 2024 21:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45LLgFFQ092167; Fri, 21 Jun 2024 21:42:15 GMT (envelope-from git) Date: Fri, 21 Jun 2024 21:42:15 GMT Message-Id: <202406212142.45LLgFFQ092167@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: 45846afcb7ae - main - release: Stop publishing non-FS-tagged VM images 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/main X-Git-Reftype: branch X-Git-Commit: 45846afcb7ae1b9682107a62b105aeb5021994ba Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=45846afcb7ae1b9682107a62b105aeb5021994ba commit 45846afcb7ae1b9682107a62b105aeb5021994ba Author: Colin Percival AuthorDate: 2024-06-21 21:39:44 +0000 Commit: Colin Percival CommitDate: 2024-06-21 21:42:10 +0000 release: Stop publishing non-FS-tagged VM images VM, BASIC-CI, and BASIC-CLOUDWARE images are published with the filesystem type (UFS or ZFS) in the file name. For backwards compatibility we have published the UFS images with no filesystem in the filename (aka with the same file names as we used before we supported building ZFS VM images); those are going away now. This will not be MFCed. --- release/Makefile.mirrors | 20 -------------------- release/Makefile.vm | 12 ------------ 2 files changed, 32 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 1888f86d3002..8a6888ccc96c 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -190,14 +190,6 @@ vm-images-stage: mkdir -p ${VM_DIR}/Latest mkdir -p ${VM_DIR}/${BUILDDATE} . for VMFORMAT in ${VMFORMATS} - cd ${RELEASEDIR}/vmimages && \ - mv ${OSRELEASE}.${VMFORMAT}.xz \ - ${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz - cp -p ${RELEASEDIR}/vmimages/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ - ${VM_DIR}/${BUILDDATE}/${OSRELEASE}-${SNAP_SUFFIX}.${VMFORMAT}.xz - 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 \ @@ -243,8 +235,6 @@ vm-images-stage: . endif mkdir -p ${VM_DIR}/Latest . 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 @@ -289,14 +279,6 @@ ci-images-stage: ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${FS}.${VMFORMAT}.xz \ ${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz . endfor - cd ${RELEASEDIR}/ciimages && \ - mv ${OSRELEASE}-${CW}.${VMFORMAT}.xz \ - ${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz - cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ - ${CI_DIR}/${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz - cd ${CI_DIR}/Latest && \ - ln -s ../${BUILDDATE}/${OSRELEASE}-${CW}-${SNAP_SUFFIX}.${VMFORMAT}.xz \ - ${OSRELEASE}-${CW}.${VMFORMAT}.xz . endfor . endif . endfor @@ -322,8 +304,6 @@ ci-images-stage: cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}-${FS}.${VMFORMAT}.xz \ ${CI_DIR}/Latest/${OSRELEASE}-${CW}.${FS}.${VMFORMAT}.xz . endfor - cp -p ${RELEASEDIR}/ciimages/${OSRELEASE}-${CW}.${VMFORMAT}.xz \ - ${CI_DIR}/Latest/${OSRELEASE}-${CW}.${VMFORMAT}.xz . endfor . endif . endfor diff --git a/release/Makefile.vm b/release/Makefile.vm index 8c48c0a13dc9..f5dc6af67189 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -209,14 +209,6 @@ vm-install: . endfor . endfor . endif - # Compatibility hardlinks from "foo.bar" to "foo-${VMFS}.bar". -. for FORMAT in ${VMFORMATS} -. if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES) - ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT}.xz ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}.xz -. else - ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} -. endif -. endfor cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \ ${DESTDIR}/vmimages/CHECKSUM.SHA512 cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \ @@ -231,10 +223,6 @@ cloud-install-BASIC-CI: ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} ${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} . endfor -.endfor -.for _FMT in ${BASIC-CI_FORMAT} - ln -f ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${VMFS}.${_FMT}.xz \ - ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI.${_FMT}.xz .endfor cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \ ${DESTDIR}/ciimages/CHECKSUM.SHA512