From nobody Thu Oct 30 20:50:59 2025 X-Original-To: dev-commits-src-main@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 4cyGVC3ZY5z6FZWg; Thu, 30 Oct 2025 20:50:59 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyGVC2pPxz3H1N; Thu, 30 Oct 2025 20:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857459; 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=c+Tk6QpaN6RYnAe2aYc1u5bJvFQerzyi9rXRxoGYjPQ=; b=ollSAHFSjw3f8SJhapnTKfseZdxuD0SimZ51tQ1TqevMWA3kVywXWZLq6w6yMMHLcKyP9J ijvuH+fZHI4ip86MdzO4oxOF2Jbx+rf6/onijFW9WV/H1WmLUd7QUjqvFcI2KY4828I+ZC cfVoS9LEyEamfVufSqgXVY5gywSHm8GU9DHR0j68q6SIVj59xIRd0nVTKkysQuDmxSV/q9 8+Q/chgOGQ3zI8cSceaD9j+TYc5aqAuVMPbvHsQ0vGgcmA4G30PffGgO/NUwI9PsEPJfSN wwy4vA4sd6++TijZkJysHFetZwjCF4bcCoGUuR7r6Oi/C6WdJCNY4Ji++5d2iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857459; 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=c+Tk6QpaN6RYnAe2aYc1u5bJvFQerzyi9rXRxoGYjPQ=; b=ufDtg95vD7cWY0nNoisVwPNX/vv+tN02jz+8KZn92OZUpiW7JPp3uecMVzX+3BgdCmaxmn FFES6JroccOQxIx4I3q2YVdSY0SKLWVDlpPWdJmvyWN/M6pBs7u9K3/ARZoZ2EtS203fIS YWiD8AQsg894Ut1HWh8lQPcY7vLHdwmlMlMAbA29+HmLfJf/nEC62w2yd1p2z5bLnZuabd onZ89duXVGXjYyWV2q0C+I7ITDN3Eg9rHx4zQwGgYuvtUEub7wmJYcY1Lh21CKXU57y+PQ mCqLeTpdWE3FmcjlUY/3nZuqANiJj70dB6KEVuB8umyAsIqfecqRoK0BbdctXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761857459; a=rsa-sha256; cv=none; b=PwluC89+jOcwn2O+O8h+oBaxGUXAK3L35lgjDsd45fmxJKX7/ZjGHvQsumOYsLPMHWbjjt SPpDrSxRySspil17JPcAoGsjHus6X06DG+vbny7lo8Vr451RG57qNvv0qVAJnhMkosXnMe FnEOj8ghRfh8ghC+OWrU02xUdvZpSKSh5hXOODAPu1UZiGROX9XG4MHVlp1CzBHW1mHbYa /YcAVaF8Ydi6Ih32vdIu1mDPejRjSqeINdiAlnS86cspTtPo8YBsfnQGeNIxTDu+bTdXn7 beK0vFxlzm9iOHtBWpF4jrUqFGVxqC6YOHOY4ac89PbJ1LZTli8zt0K5rzqjMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyGVC2MP1zfgr; Thu, 30 Oct 2025 20:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59UKox8P043569; Thu, 30 Oct 2025 20:50:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKoxmG043567; Thu, 30 Oct 2025 20:50:59 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:50:59 GMT Message-Id: <202510302050.59UKoxmG043567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: b485322d6b58 - main - release: Only check no-root/no-qemu when building List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b485322d6b5846fe4fb5aff6c4a07221b09946fc Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b485322d6b5846fe4fb5aff6c4a07221b09946fc commit b485322d6b5846fe4fb5aff6c4a07221b09946fc Author: Colin Percival AuthorDate: 2025-10-30 19:14:25 +0000 Commit: Colin Percival 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}