git: d576c1dd9744 - stable/14 - Makefile.vm: Set CLEANDIRS correctly for vm-image

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Wed, 17 Apr 2024 05:44:03 UTC 
The branch stable/14 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=d576c1dd9744d65906c257e226cd535e8aec574c

commit d576c1dd9744d65906c257e226cd535e8aec574c
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-04-14 22:27:19 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-04-17 05:43:27 +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
    
    (cherry picked from commit 7ffa1f14e3c19f0061ec9f38bb74c564a49ffc17)
---
 release/Makefile.vm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index 136e58e1aded..0eb549ec7bc2 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