From nobody Tue Jun 9 00:48:50 2026 X-Original-To: dev-commits-src-branches@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 4gZ9Jf2hN4z6h39g for ; Tue, 09 Jun 2026 00:48:50 +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 4gZ9Jf24Qdz3Pnl for ; Tue, 09 Jun 2026 00:48:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780966130; 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=GSTaX2i0DIsHn3CKs1A7bGFhQDxUnrPlrzbP2ceh0/HZINJk+kzPwzGb6zjqNf749Ba9z0 Qxjc+XCBBQyehnhYrxrJZ9p4uxZS90IJ6cBaxIDinDGddhV+qJTNMYqiwi4gyCpUw/B/m4 aCn0u/KOGToXHO0tytrvlnqyX05drCPlxQCoeeTSJn2LsGdx3bBRUJFJ8DY8IjjxdVNF3m uyDEqEL9sCyJrhBxF5DOBNNiIdkrUOcpTTgspc0ieSmXOg40ytHkmfMEcBbTx+Gt7tcDc6 6VbeoxIgtjVB/VqgWT8vQJ5WxccFlP16IbHXRt4WYIv79V0fCzVMiRRD5tmqYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780966130; a=rsa-sha256; cv=none; b=f2+fOnqMqH9fUnRpDiC1phbOvaFVpFReHVEvJ0NIagsnhxopumOusUwhvnnsrp9cJe/S5a 2zQqnvR56+lvQVvJi/Bjigq83oEoFtv746ONKi9Z76nNep9rsI/lx/PHx1YrbnGfIrfUzl A8uauGz5Dgw1LrG/IwWgQJpf1yt/t7X+HtI7cgVQu21kS9LalgL+TjSC3L7zFVuSbPfzNO Ju8rbBByqX4583j8tpEz0BL3lPEvM/YO3GQZrWOtzYHpYZZMV8PGcIVmOJHuz4Y5JGmvWZ z00QWKomh1B7zLgVtPGElNvtkOnlGrsYN9u0X3s/cuBX6cFRItN814YguOWtyQ== 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=1780966130; 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=FocpiJklljoA3RC+rsdqjxZusTIy62s5FphiSyhIRmjabzWYKglfuqKSZ31V2JmMQR68Ks uyqxQiktHcsc7jQGkcL8uSjaEfnOt3JNCJM0IATwWbDq7Zf5CkkaGAA7tedPpZu0LU/165 G71kLyP5X/r4+IH+fPrUbCh1mKdSgD61ATrfN3AhcZ1Yd36z+7lEzGitbZBToZmkwRE2WS eLRDv79Q5ZxMJndeyUNBkE78cEyJ6E/SxwHpaeXmVvDtPho7ogum5i1eko1It1J3LpDo1u nvrRKC+3SMoleMPLM92YtQYnAfdp0UTMWFbEwnfHC3VkJbtNzqFcyf8WWfjzYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZ9Jf1QCnz1BLH for ; Tue, 09 Jun 2026 00:48:50 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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