From nobody Sun Apr 14 23:46:00 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 4VHn4T3MPrz5HJq2; Sun, 14 Apr 2024 23:46:01 +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 4VHn4S73zgz42gx; Sun, 14 Apr 2024 23:46:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713138361; 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=NMYbtJ1hK2hHqEvM1ly3y7CbTWnQ9w2GHtdJR9FsZkE=; b=oQ3XZyWeox5Bt3F/DzAqN+mCXXLjZ8RTppFtOzEiNR2ShN65En6ak/rceiYrFoQKAofjJB iOEGkbTxxq2zFEcrfsbWYuSnR/5u2FERvB+xqnqQ0EPRK8sNueJFkDBwh9VkmBoalsfh+M wvn6gzb3YH0AZTsmhP96JvKkdVw9LElKlL6wwI6r8NlkwaKolAkmzxrkxa1GAcAbOy1v9i G4sQ35Ul9GW6+Fj6YUn44ZermGW/G1SCqTqEVn+7JuV6Js5oUpLoH6QH/Fqx6AG23XwhUs sbxQes8ZANaa4H65Y2AOmUF9DmBRsWA/JWl2aBM4h5f4NXoQUZieEC/upX/uqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713138361; a=rsa-sha256; cv=none; b=iT0YA7keiNxhJkZIZxYZHp7Pm7wSm8BM7ofzaMucXEHAVrM/1RzYn/RxR5cTn0djOftPqX PRAe9tU2+u0iIxRjJzJDAfH1vVUzYiRVM5OBdzZ83eZlHE3madOb/kE3mhexUhVSWjKK95 QV9hjdt4ToVTXCNA0sYkr+STtO9r8Di11Rd4sYifbsBoyRQrplD2NqWwTdOW0WY/W5EQxq VYy/viyRmV6y5OxgkDzHuO9rqyAKYZAEGUz06WHG8mjhdxpgzeWMcfXQPjt2fNnFV9V67L 82iCov7fZQhXlO5uCC4LvmcUMueISm8cWFbH0tvIUg8c7kaG4t5VXQPM1RpFKg== 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=1713138361; 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=NMYbtJ1hK2hHqEvM1ly3y7CbTWnQ9w2GHtdJR9FsZkE=; b=do6L6NLHrxIxkaH9qdE3WzErnumZLSzOds6XWuTyhlTVccupoKacxzk/reCQf8wfvoQ8ps x0nZHSrTOGScoRBAH2QiHKFGgV101ag1ncEAoeaqtat3WmW/LE/lqvDmD6Oc6w5nBepkrD ZnVoamjVwHDEH21DMPmEFWgUn19k1FLs9GWgYiIcVw8bUh3g9pXdmiCy00CNiUclBYHWh3 3O5ehcujHKEnYhw+j8rHt79o2nKL+hPIgF/r4mkFG3C1o/qIyZegX5pRwtmT8aT+BGqbpC b2lsu1TfyLEr3/d9BPNR21BU3n9DMViTf4IGOafC1t4uN420xJWD5MMi2hGeIg== 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 4VHn4S6FcGzcqg; Sun, 14 Apr 2024 23:46:00 +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 43ENk0nO012662; Sun, 14 Apr 2024 23:46:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ENk0Xg012659; Sun, 14 Apr 2024 23:46:00 GMT (envelope-from git) Date: Sun, 14 Apr 2024 23:46:00 GMT Message-Id: <202404142346.43ENk0Xg012659@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: 7ffa1f14e3c1 - main - Makefile.vm: Set CLEANDIRS correctly for vm-image 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 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: 7ffa1f14e3c19f0061ec9f38bb74c564a49ffc17 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7ffa1f14e3c19f0061ec9f38bb74c564a49ffc17 commit 7ffa1f14e3c19f0061ec9f38bb74c564a49ffc17 Author: Colin Percival AuthorDate: 2024-04-14 22:27:19 +0000 Commit: Colin Percival CommitDate: 2024-04-14 23:45:40 +0000 Makefile.vm: Set CLEANDIRS correctly for vm-image With multiple filesystems and disk image formats, we now use different staging directories; we need to include them all in CLEANDIRS. Fixes: 97bd53ef4d20b "Makefile.vm: Fix duplicate rc.conf files" MFC after: 3 days --- release/Makefile.vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 83e3077b5bd4..2565a13ef671 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -145,9 +145,10 @@ cw-${_CW:tl}: cw-${_CW:tl}-${${_CW:tu}_FORMAT:[1]} .endif .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) -CLEANDIRS+= ${VMTARGETS} +CLEANFILES+= vm-image . for FORMAT in ${VMFORMATS} . for FS in ${VMFSLIST} +CLEANDIRS+= vm-image-${FORMAT}-${FS} CLEANFILES+= ${FORMAT}.${FS}.img CLEANFILES+= ${VMBASE}.${FS}.${FORMAT} . endfor