From nobody Wed Apr 17 05:44:03 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 4VK8wh2crnz5HttJ; Wed, 17 Apr 2024 05:44:04 +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 4VK8wh000Cz4lNQ; Wed, 17 Apr 2024 05:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332644; 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=suQLl7hqvt6qo0xjNS3BSdrnhtzVYMEUg7meMfwVqIw=; b=CKH+rEGMVOqxvASLQMaq3crBGyzTDHI/3xih8Wxw+dMwYW6RT+TtV2FeUiLty6UlIBP5YJ MAWXwve9PQKiU++JWVN5i5Fm5drti6FIQo3S+rkBy7diWHfjd3Hjh4Hn41GQtvY703o8Cy JFCaUj8FGaThdfC16nN4c33C4RRy87Ht6glTIuMzwbUcbszuAT/CvwDf7Dr20DS3mXNQgE fWoNm8IQzReiNSW/p5zKOH0tEcaqMyKr0icLimKPGrdLaw23LDO0Wtmw5K22/nANaEkipE Z8Em/rT6T4NTYjpYTD10PEi0nPgjyaFNMj8HaQi8S066NFDgsPxNyXzWqIrGGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332644; a=rsa-sha256; cv=none; b=cBBZ80xTu4K/PpZxbfAREsLqaIw9JSzQLhtqyROdf5Z9a26xvL2bcxQbQYiGhRhL7Elu1t y5Jug09LVQPza2IRU5/L0LsfCFYBBx4XQgy6zQk5vfKBx4FAsNK1dFOy5Ey2c2l956hwBs Ilc7ue/29sRw+7CYyhv5/tVD3zUy7xgK/pH5ZdwxWbnQzvG70ginGOSpRWI9O7IXt6d1r5 5pg+l40zevYtfvCEVYTrZxMzHV5Z24vIUheaCp7U6JFEtVsMv6Iohm7nIF9RBJMaEoemO0 1OwiKPNZ9Sgm0qhQK0Q9KUg0wBZhHTASb7NAcCswUuqJscn1uQz509q5zY3t/A== 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=1713332644; 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=suQLl7hqvt6qo0xjNS3BSdrnhtzVYMEUg7meMfwVqIw=; b=wfIy79H4mgKjDnufk8Lrtf8amAxaAK3FRT8ADfErjlFKPG7liAhDapY+w5UIdB7jFyraTo awe5VnDTUHW+YUXJdGIJSdIyDaWhukWgmJciprco9uDXau+IVnYhqhnuirm79uy8sOuGKL 3klIC4AXjlvbt+ScwEHz5w+z5+6LoV0MbO0PXkxoYtEdYNua7y7mtzGQ/bUXPMH8ES2GiH 5wMqObKprNq0WV9KgWqQtDqe/1+pfcf+IfsdqYO2DzIfDF1o1eIs5OxvHXKsmZ1i1y+Tvy x5jFSePRyd98SEDVGLI9f5u3ICDrN2vTFaml7zEygyFWqmtT03c5iMOOKU9xHQ== 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 4VK8wg6kJqzFBw; Wed, 17 Apr 2024 05:44:03 +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 43H5i3Ct007138; Wed, 17 Apr 2024 05:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5i366007135; Wed, 17 Apr 2024 05:44:03 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:44:03 GMT Message-Id: <202404170544.43H5i366007135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: d576c1dd9744 - stable/14 - Makefile.vm: Set CLEANDIRS correctly for vm-image 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/stable/14 X-Git-Reftype: branch X-Git-Commit: d576c1dd9744d65906c257e226cd535e8aec574c Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d576c1dd9744d65906c257e226cd535e8aec574c commit d576c1dd9744d65906c257e226cd535e8aec574c Author: Colin Percival AuthorDate: 2024-04-14 22:27:19 +0000 Commit: Colin Percival 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