From nobody Wed May 06 17:51:36 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 4g9jcS3vDHz6cGmW for ; Wed, 06 May 2026 17:51:36 +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 4g9jcS3LQwz3pYQ for ; Wed, 06 May 2026 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778089896; 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=TS84LBA943yAUD4bugGgj8ggyKNf/SMahrcWhj7iC+k=; b=xHnZ26jogXgnk8zCsR2/NhxxL+L4Uo1Vi/MKVMSbM+VJCV+vtuzkdNAUZOvkz0cs8Twc+o 5lgJB106FtTOq1ZlkXW8xuf8kLMvSVJmSJA/E6ha4riL1fHtqa2S1Lt3kfv+zlwJ1kjvP6 GAsTRtELGaUDLi1g7dz0k/aSOVpIoo3Vs4hx30HfrUqyEidLUebaiGk1j8ADNx+kVw6PIA KYbwMuwznZbuASTH/VoeKjROD1pyScs5AehjAwLWXA9nKutC77MtGPEmI1FzaRM+LWvl3l MujFp/66eHD4q1YK6bgz/ddeJpTA800Qw5jwARGBdUNbPdl4kYC/+KQH2+l2rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778089896; a=rsa-sha256; cv=none; b=NQEwskpvx2Q/sOOShJ7Z8CGvzyoqaSkpSQR0MUVNGeLnPyRteWonfnG5HzzCH7oiX7REkR +sS0S8UJ1WuyD0/2RmDdwYxTeK74fSrvhYXw+GYgB3Hnv6VXtmECXFUyd9A/g4T+TfsS1O rWY+XSlv5ZRi8fCVx1lw8rrF917RHWzV+pAPEhkCbwvRTwZV9b7kUyaYtBXdt0BhQarHyx ecOZa7/Lcyh6RRM1SOb0qqb7VA/UJMqBLWP+HHC/ZkyFfXFTkFE9pR2Ax9Eh/6iYUyFifI K2Tl5r/RFyUIaUGDhMSAmjiroKh5epxhM1gBhDZfEmXocTwCdACIPEcDfTEBnA== 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=1778089896; 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=TS84LBA943yAUD4bugGgj8ggyKNf/SMahrcWhj7iC+k=; b=cB8XP814eRDg/qz8buDrvPId99lPqhSVr2WQiOxQLpaLQhu1mpXISqBpA1xDp8lmW3vecO Uuu+L27x+R8Q56+XhJF4N/e6H9i9H4MvAfKKBJ9UnXkFRQYnuHsqIbFPbfZelI5nzqtliv clKRj11UqktB+SLw/kxplQzi40JpBmnuW4oL9NYTAeXbAcTy1lkFypchDGId1VIjdI0KXg GK0O6rf9Tsrpo1BctDOO/zG7W5fjfkDj1LSQZuURg4ovMFqB70GDCuWPJaki7a7ywGhxYj 5OXjhgs0zrUrk3GM+j0SAHuSj0CId+SDm+fyRfuyYyfKy4Ml7Zbg6PtAUicSfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g9jcS2wsYzq2c for ; Wed, 06 May 2026 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36fcd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 06 May 2026 17:51:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 76d756eaa682 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 76d756eaa6823aad282cc53ec4e41a9777d89adc Auto-Submitted: auto-generated Date: Wed, 06 May 2026 17:51:36 +0000 Message-Id: <69fb7fa8.36fcd.7fc03439@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=76d756eaa6823aad282cc53ec4e41a9777d89adc commit 76d756eaa6823aad282cc53ec4e41a9777d89adc Author: Ed Maste AuthorDate: 2026-05-05 21:12:25 +0000 Commit: Ed Maste CommitDate: 2026-05-06 17:50:07 +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 --- 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