git: 726d4e14869e - main - release: Let basic VM images be built with NO_ROOT

The branch main has been updated by markj:

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

commit 726d4e14869ea4728b6ef2a3e4d6c43481416248
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-04-10 15:47:29 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-04-10 15:47:29 +0000

    release: Let basic VM images be built with NO_ROOT
    
    Reviewed by:    brooks, emaste
    Sponsored by:   Klara, Inc.
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D49738
---
 release/Makefile.vm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index 3b0ae4227453..b5ec044fa94a 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -1,6 +1,4 @@
 #
-#
-#
 # Makefile for building virtual machine and cloud provider disk images.
 #
 
@@ -107,11 +105,12 @@ QEMUTGT=emulator-portinstall
 .endif
 QEMUTGT?=
 
-.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 .if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) || \
   (!defined(WITHOUT_QEMU) && defined(NO_ROOT))
 .error WITHOUT_QEMU requires NO_ROOT (and vice versa)
 .endif
+
+.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 . for _CW in ${CLOUDWARE}
 .  if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF)
 ${_CW:tu}CONF?=	${.CURDIR}/tools/${_CW:tl}.conf
@@ -181,6 +180,7 @@ vm-image:	${QEMUTGT}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
 		QEMUSTATIC=${QEMUSTATIC} \
 		${WITHOUT_QEMU:DWITHOUT_QEMU=true} \
+		${NO_ROOT:DNO_ROOT=true} \
 		${.CURDIR}/scripts/mk-vmimage.sh \
 		-C ${.CURDIR}/tools/vmimage.subr \
 		-d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \