From nobody Thu Oct 30 20:53:42 2025 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 4cyGYM4N9pz6Fb3F; Thu, 30 Oct 2025 20:53:43 +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 4cyGYM1wQkz3JNV; Thu, 30 Oct 2025 20:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857623; 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=K67WjnEhglj2pUShnNGLdKbLgrcSTWByrFPbiiFUnPk=; b=HSyDIUmnaEVhWphzdbGMYZdNpV5yJyf0Jz1gQ59HXLfZpv4uDz3Ke9Iw719VHR39TtlqJB hA99OlFTCUStihSzQFdzIniEFBK/VcP+XbUbLEb3GAA6HOFcH7JJmUuyHuSDIvVaNFBJDd S3xR/yJJGdsltZ99JyeMnyN1Az87VnknuWVJhILKC+ndtTFQ0RASjdQgnT1wCQyCR1CD5F ph9172WbNI6m8ry2L4v54gHtz0NAnbwlKdPiMdhBRUScJqPx0VHVHSU+jkQyni+I3954MO i4tueeZWVpZcB7lBRgJHNyp+c818WMPerzN3zJTBIxPwrP73FGNCRB402JW6BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761857623; 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=K67WjnEhglj2pUShnNGLdKbLgrcSTWByrFPbiiFUnPk=; b=lYA2rNd/+CFE9tJDyQHXNC648EgLrGVy+8j9jaFBCe9OByu4cCibliNw3QAsxrgjRslwBf kj7m38Un9oiK7a7gYhefsyVeelscW3C1Keycj/XG4suApdXpyYcvR/j8tyH1CQZ+1HqIfD asvc7lW9BO+/XzPq5Q2yJ8D507GHP2T/zu8frK5dPvvdXgS9xU7K3FNTYShXyPQSK8N6wK R2GTUNFvGxb/4pWd/P217Tx66qgFd1gU4ld2iqVQgvsiqcLfTm7AODgJIwf4Yvo1LMZ0zR Ma/kyptf9rEqtA0vUuJabLCDahJ31iqxivqdBvLkJxqmWJ/V44e2WHCO4YhMEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761857623; a=rsa-sha256; cv=none; b=YK9zPNSirO6otyslVqTIf3OAsYEfzCxU8Wg4YCqn/NHKkHHHqBYGWRDR2FOTr38WJmAEhf fLIeSjPabBSn2PmMa+g8czCoZ23uBYnLk2AmOfnDcIr0MwKcOI+6ggSIUhRY5Il7wZpIjn j3lZAhkbZj/SrbThxKk2i+Gx17p3XyimdDO8Uxy46zPY+IkiAm4Buiisy2wY/lCm9etBjC FDK7GMFtIiYt+K6emSr4zVpkNa0Cpr4SfFAzLnJIsvqpwItBg1/aOkOl0TdyFWa8biYQ1R 5Nq93gybnLX6X+hfOGToFbAbWYXMJMW1jNzokIl6nFgjmjkLaUxpX7BuFYyRtA== 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 4cyGYM0qB1zfl5; Thu, 30 Oct 2025 20:53:43 +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 59UKrgE6049951; Thu, 30 Oct 2025 20:53:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UKrgTL049948; Thu, 30 Oct 2025 20:53:42 GMT (envelope-from git) Date: Thu, 30 Oct 2025 20:53:42 GMT Message-Id: <202510302053.59UKrgTL049948@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: c824a1319149 - releng/15.0 - release: Only check no-root/no-qemu when building 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 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c824a1319149b3d76b633eb4fc26dc0a6506d561 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c824a1319149b3d76b633eb4fc26dc0a6506d561 commit c824a1319149b3d76b633eb4fc26dc0a6506d561 Author: Colin Percival AuthorDate: 2025-10-30 19:14:25 +0000 Commit: Colin Percival CommitDate: 2025-10-30 20:53:26 +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. Approved by: re (cperciva) 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) (cherry picked from commit 6b2f2e03f18f5bd7a3175d2b083e974c72cbf453) --- 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}