From nobody Tue Jun 9 00:48:50 2026 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 4gZ9Jl5NDLz6h2nF for ; Tue, 09 Jun 2026 00:48:55 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gZ9Jl3J2Jz3Pr3 for ; Tue, 09 Jun 2026 00:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780966135; 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=vUqQ56NhiRsr6HLLmuiDJLKABhkFySJ/Pr70WOvfWQM=; b=oeJO89WcjmdPEAISTz6zhCyxHR+2NiqUpHlZ5b/fOALX4uVnWwUpsBgCab845Z2C+JzWXm +0FyfxZWmdxTMlvw3KfcNc5vO1QeDZbAonvKr4OBukMkul2b+zSoargHS/lASNux977cHA m2ebTbi+tyeWt4KLHBeTXSXkT1zOqJAFMr69P6wc633nGWo3BbyEYDj3tQ7txXy8vEMFE8 6Lqr1slf/aZAOTSWnlPQRysCvPEklWO4H3LXGCgSPPPzMg4PgniGk4e5ppex+SkQkjbyFd 7UdySH63fRVsbeESCUifGpAl3ANBY1wwwVRyZDZqeeKL4L8UA0KpwAfGFrPOqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780966135; a=rsa-sha256; cv=none; b=hJvn3ezbs319dArN5Ne6ofMwuK5+4s3lwd+Q8CR0zXLgwHLWlfeOxJ20qsXBKqt8B0J0i6 H8rYtTLQI4NChj7JkrChpoMsgKN59O+KmXCy0dYOKsX6LC6inONWge/CnzbitKdwfhHTdZ xYAyks7uoDxF6sVxD11s7fDacawZgUT9g+zZTkg8A27gk91j6jNbPIDEy+8qHxPqzg0iza HJqgRKmACwk4NzgyXRM/N2lVLXjfTbf/5Xf3sICCoaJN4vG3HQMrbSDZhiDZn8ZU1uCYFu KcPW2j0YwhMpA8tT148+CA/G2WmvF7v7mXLWrTW/eMP7MPMcCepOFWxeBbBnmQ== 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=1780966135; 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=vUqQ56NhiRsr6HLLmuiDJLKABhkFySJ/Pr70WOvfWQM=; b=hqfNO0AtwgcCdITmj/+82quEyxtxmUybD+NgERChwZ5yBzibAm62s1KM9ySLQxmVe54Pom 7ky0KPMC1Kc+bM5T7ZpB+1paYqXVp7HD3ePsaTAtreYUFDnNtJ4GQ1s5mhlEFpJHpZWKF5 gGuzRQ0Ap4suswv3VUFOxS/aAsrWls9mySyahm0zjhW2iZldcvqZpWQMpOJeBDbP2q+PhJ qWdkAvymXCj6eAungK1VJs4y821eJrrpkA2IcKsP7pcTON2ZMP6dv85ATVGYYrmDAtpR0j C6iPcxze1XDm7N51BsuFB/NEbfaEuLmNVyHjkSy3NPa5ICDuNhJzu6OCzB890A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZ9Jl2LqHz1B9D for ; Tue, 09 Jun 2026 00:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3937d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Jun 2026 00:48:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6a1e761dc47d - stable/15 - Makefile.vm: Split error condition 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6a1e761dc47d36f550393cb90cc0e321c9cfb3fb Auto-Submitted: auto-generated Date: Tue, 09 Jun 2026 00:48:50 +0000 Message-Id: <6a2762f2.3937d.285c22c@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6a1e761dc47d36f550393cb90cc0e321c9cfb3fb commit 6a1e761dc47d36f550393cb90cc0e321c9cfb3fb Author: Ed Maste AuthorDate: 2026-05-05 21:12:25 +0000 Commit: Ed Maste CommitDate: 2026-06-09 00:48:29 +0000 Makefile.vm: Split error condition Make it clear which of two possible cases applies. Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D56837 (cherry picked from commit 76d756eaa6823aad282cc53ec4e41a9777d89adc) --- release/Makefile.vm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index d937783f02fe..8296fc47a477 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -99,9 +99,10 @@ 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) +.if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) +.error WITHOUT_QEMU requires NO_ROOT +.elif (!defined(WITHOUT_QEMU) && defined(NO_ROOT)) +.error NO_ROOT requires WITHOUT_QEMU .endif .endif