git: b485322d6b58 - main - release: Only check no-root/no-qemu when building

The branch main has been updated by cperciva:

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

commit b485322d6b5846fe4fb5aff6c4a07221b09946fc
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-10-30 19:14:25 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-30 20:50:38 +0000

    release: Only check no-root/no-qemu when building
    
    Building VMs as non-root requires no-QEMU code paths (installing
    packages from outside the VM image rather than inside it) and vice
    versa; we have a check for broken combinations.
    
    Unfortunately that check was breaking
    make -C src/usr.sbin/pkg NO_ROOT=YES -V PKGCONFBRANCH
    because that code reaches into src/release to determine the branch
    name (which is then used to determine which /etc/pkg/FreeBSD.conf to
    install).
    
    Wrap the no-root/no-qemu check in an .if to only run when we've
    asked for VM and/or CLOUD building to be enabled.
    
    Reviewed by:    ivy
    MFC after:      5 minutes
    Sponsored by:   https://www.patreon.com/cperciva
    Differential Revision:  https://reviews.freebsd.org/D53486
---
 release/Makefile.vm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index 336e8fc82299..a04f779ebebb 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -101,10 +101,13 @@ QEMUTGT=emulator-portinstall
 .endif
 QEMUTGT?=
 
+.if (defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)) || \
+    (defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES))
 .if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) || \
   (!defined(WITHOUT_QEMU) && defined(NO_ROOT))
 .error WITHOUT_QEMU requires NO_ROOT (and vice versa)
 .endif
+.endif
 
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 . for _CW in ${CLOUDWARE}