From nobody Wed Mar 12 21:07:05 2025 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 4ZCjqt1Dzcz5qVQH; Wed, 12 Mar 2025 21:07:06 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCjqs55jDz3xll; Wed, 12 Mar 2025 21:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741813625; 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=6Dg2CbgcQKNzR/zVY7Kb5DUjzj9TNCjEOGR7M/hRyrE=; b=jwM+8jlXKkF+EFQwUjr0rdWAeUNnbP5x9bkmPcYbTNu+uzz3xh6f34YopunDUKK/lJeIKR yDP2M8q2Eo4c20HuFjdbAhsSP1PZ5mhzwq7wrH8vRmJifn8xsnZoQweWfJJmnlj2szYAaJ mQ+XfjCevwSVd4qu1IhSkOlGPlPCPZF7O34THeL1rNYdqNh9voZm5+Bv7/7G3w2vnFsG3m i1fxFcX4QgGJDE0Zss/2LSALIakht9z6I/2Jav454fVqI9gAyYex0IwgO7NTEGmuzEYwE0 ZnC8ypivaARRqXEnCicynf9FYVtFioeIG/lRdUP/a70FZHmU2nPl27qdP2Aq+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741813625; a=rsa-sha256; cv=none; b=ll823pjsUEGAthYPFIIWV/j0XSxRk6fqgDWV+vOiwcLv0U5NrjLeKD8e303dLMu63tBnVi u5sxwBVnyo1dUUHmAJm4+7Wnw6SBJJUk11IndQmspXpZtJjkDmIVa8yWcQPsHAz/K65RvH hwMY43qngXBCAvf9HwF02b1blFwld0FTVhhvLQIG9jb0YEwsWq1Tv5XH4Cg2+M+IhLlN4g 2MBzsAGzE0rhn4YEykhlX8SEkvUodUtA6C5TpVzLr1cj8ON1dDhp+R0kYMWZCo6sDR+oKe DO/g3eW05sRlEH0MhXlhbCv3QihFlTW6I/oJOQe2LiKlX2aEY4G0OkVPkQHtvQ== 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=1741813625; 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=6Dg2CbgcQKNzR/zVY7Kb5DUjzj9TNCjEOGR7M/hRyrE=; b=dMSX1lw/KgZmR8HUAfOl2qau2riWiRm7lV3SbwATlxgQr/BArYRwCD/rTtY0OFMMlKljck uFxYqbcSGzbt+8By46Q9EockmKVPWdI0/79hoIVSh2KNO147s8EIFQgUZa2vubBdKrgKnO Xf3T6BYDwdn2z6elynPIbT7Jj7hnd2yzs/iRp9eUqjuUwbtP6IHmH/vo7cFJbriG3QX9hW LMNQtKicGdb4vQlhPDbMkw8/b+irQIsEOmX3Zp39E/VZUprOlPqik799hNiBsBUFnbS/QH CjOMpFxch79a2yqYXJ61GkNYoqxHkn9wyw3PfXJOrNXYGDHwTzntH5J5JiTMBw== 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 4ZCjqs4fNYzCF7; Wed, 12 Mar 2025 21:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52CL75Hs008612; Wed, 12 Mar 2025 21:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52CL7558008609; Wed, 12 Mar 2025 21:07:05 GMT (envelope-from git) Date: Wed, 12 Mar 2025 21:07:05 GMT Message-Id: <202503122107.52CL7558008609@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 59c529f2c856 - main - release/vm: force replacement of compressed images 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59c529f2c856ec557954aa81b47603df8871ec25 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=59c529f2c856ec557954aa81b47603df8871ec25 commit 59c529f2c856ec557954aa81b47603df8871ec25 Author: Brooks Davis AuthorDate: 2025-03-12 21:05:17 +0000 Commit: Brooks Davis CommitDate: 2025-03-12 21:05:43 +0000 release/vm: force replacement of compressed images Without this, rebuilding vm images will fail due to the .xz file existing. Reviewed by: emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D49321 --- release/Makefile.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 0dc7bdbe1fe5..1f56bdb03f97 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -222,7 +222,7 @@ vm-install: . for FORMAT in ${VMFORMATS} . for FS in ${VMFSLIST} # Don't keep the originals. There is a copy in ${.OBJDIR} if needed. - ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}-${FS}.${FORMAT} + ${XZ_CMD} -f ${DESTDIR}/vmimages/${OSRELEASE}-${FS}.${FORMAT} . endfor . endfor . endif @@ -238,7 +238,7 @@ cloud-install-BASIC-CI: . for _FMT in ${BASIC-CI_FORMAT} cp -p ${.OBJDIR}/${BASIC-CI${_FS:tu}${_FMT:tu}IMAGE} \ ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} - ${XZ_CMD} ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} + ${XZ_CMD} -f ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT} . endfor .endfor cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \ @@ -252,7 +252,7 @@ cloud-install-BASIC-CLOUDINIT: . for _FMT in ${BASIC-CLOUDINIT_FORMAT} cp -p ${.OBJDIR}/${BASIC-CLOUDINIT${_FS:tu}${_FMT:tu}IMAGE} \ ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT} - ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT} + ${XZ_CMD} -f ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT} . endfor .endfor cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \