From nobody Thu Oct 30 20:51:35 2025 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 4cyGVv64p0z6Fb1F; Thu, 30 Oct 2025 20:51:35 +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 4cyGVv5Tkcz3Hqq; Thu, 30 Oct 2025 20:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857495; 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=Fe7EDPA0enqbEDsc9KQuMqRihgfCfGX0ebwZEPaORQI=; b=vmKHZq60McAKJVZMQfN/EkR8XzTQ8KahsEN6YswUuQ25vLcIIsRXKRUm/qrDs7fHo/ijtg F7bf6jlNBHMrIFOrGzGqRtCTCTH7pm9fbaji8v2FEezehvinH5/24QKmvRASOyxu5JX7rh RCGQv8sTtlxU/fnM+lnKnv4jcJ2ipuIaf63iKmEZJA6VWhAKYlipxlLHk6Y3hvjvDP8YoC EEjjhIhI8xuEfgELJTOMkbLfZESlbsX5517iIl25GvjkDAGpBcJAPX/35z9e8f6LF6a1yt qnakTMFuhVOr582o+ElQskRS3R59RBJ+kyhw6G7sBOxiZ0ez5aadlsMGYpncOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857495; 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=Fe7EDPA0enqbEDsc9KQuMqRihgfCfGX0ebwZEPaORQI=; b=GaCX2UQ5TIlpRgfnRy5+iXBIRVzFV/mO1YUB3hppJBvAeAlnfSBk9MtFqMgvNWK2MfCATo x/F+Y5AQfmg0HWKltabib1+0rZ20OKMjOrPShw//lLnYnJpJ+3QXI8gtpZpviL3vXibwad N5JeAiXHNbrDl4NThNE6IZPRpZG+LMmkcyhShVggXe/FN0wGYB+2r0O89I325wVK55ApUz O334pBggC56H7bSFkkcnUyDiQEYi5TSXPq0lwqH/DcxDE3O4Iahd5WrCIoYH29Cdjh0Jn2 EcbjF91MLHKNdlCgamotdzf89CsjIwokQyDyrVe58U82kTqLDsJrWcPbl9zBfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761857495; a=rsa-sha256; cv=none; b=jaQz7J+IV1vzTIwasalc6TDEFpQ2x8xRVJd9ooFpudIOa7Fuaq5tRRZkkLOk7N96P4LICj yD7H2LDouGc6iNOjKesL+7b45deEPl8e2FYvYKdyKvDh3XEi+cwcvG3nUrn3G1RUFgdIxf llOgMe1qSPIAFUar2GiM1wY/wwIyOV7wv89ok5Q1EWxR1Q7p5S6GQ3zUD2hOv85IJb1Slw 8P5DR41AC80VGKkLsSp0mv6aETwU9ARIeWC8jsq0yqfU8zDFrz8SH4ynpG0aZgyUTUT58m Ell/xxBQ5ih6kEeojJJf/00Gp27X67b1u148RE8SheJEUeBdD9PIOEgKgHeWZQ== 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 4cyGVv54Q6zdkX; Thu, 30 Oct 2025 20:51:35 +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 59UKpZHH043910; Thu, 30 Oct 2025 20:51:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKpZBw043907; Thu, 30 Oct 2025 20:51:35 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:51:35 GMT Message-Id: <202510302051.59UKpZBw043907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 6b2f2e03f18f - stable/15 - release: Only check no-root/no-qemu when building 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 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 6b2f2e03f18f5bd7a3175d2b083e974c72cbf453 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6b2f2e03f18f5bd7a3175d2b083e974c72cbf453 commit 6b2f2e03f18f5bd7a3175d2b083e974c72cbf453 Author: Colin Percival AuthorDate: 2025-10-30 19:14:25 +0000 Commit: Colin Percival CommitDate: 2025-10-30 20:51:31 +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 (cherry picked from commit b485322d6b5846fe4fb5aff6c4a07221b09946fc) --- 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}