From nobody Thu Apr 10 15:49:09 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 4ZYPPf18Bfz5t5j2; Thu, 10 Apr 2025 15:49:10 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZYPPf0GR6z3bDv; Thu, 10 Apr 2025 15:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744300150; 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=oSj4sQEOReh1iljl4gW5A8kE/O1sEkwmbL5ZJhpudAU=; b=pcra9PPr+dfxn1MQJMU1cWU2jGOCm8ylRzYedbLgEu3udmMuVSo1/FgFpc20AHmX3fYgrF GNljO15IZhIBD2F76rhm+UWlCRjvGeA8f69Pc75Lg/6HH0Y5XW7FGOclbirLc3YgPiP9xC VIj5XoxZ/DQ5JwbJw5cur3E0AjD3oKFdWHeRyDvZaCLllTY9HJHDP22fHOZQGWvcHPEoW1 DgWSVAD//SbgDGTNG9Jd2DGtiHi/6Gkav+sFNBMjkZMbVE0ipP2S2fDPuyL+RXRVz5X+0Y wXTsdMC9mAbLK8Bue3LuV++RDjC/GHgmpO0Oijcky1b9JC7IXaEhBeTBbfku9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744300150; a=rsa-sha256; cv=none; b=souKNzupOjmE9qnnuYz827oHsCH7zAVFfqsPMvRC4BxXXRiRPumIB5JH38wSiX+36W8WqE xcBbMS4LS8lr5lCED3aR/oiMwRJlNBxzpJIbvvyAZ1xKXeHbrjSR/YTQzBc2/7kl810Hno x4APoPLt4Vuv/SpIyISzwd4J64fGTqvF31qlSLpAkOylkC/uITDIVZwQv2jqrAzioyv3QO cqr7jw9oJAHN8DD/9ThYpfOAJI8wBF+65U/gymE73lZj0iAgEuhJwXb+6DVhnzxk61dCJ6 nhj+7R/nQ280t2bhYMGL+RMsYG/lP/DgzWkCs9POL5ivIGGVz4r6q0PG7uv6fw== 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=1744300150; 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=oSj4sQEOReh1iljl4gW5A8kE/O1sEkwmbL5ZJhpudAU=; b=OUORi7f/7hrsnU78FoL39Vli94Ea5Ui/RSyhbOtEBUeX3bmvH0ZT5jKGO7nvKFVpIZlx1Z QmXjijJCGRof0vZKY0HqzIH3aa3t5ay3b09uyUYK/S+ptEMZfxvxw0bKKh7BbNxfrXMb4q sHeZ4D1NglvYiGmbIlCQuZ80Hmj7I5HcKLCstDyrZT8dox10M917BWVnZz3sv6++F+Y+L0 8sGuhk16r2LLGi7Hi9ZgbfFRsjA7r+AnIwJXRrxA/QJJPMoPAyr2vLg1jgh7GRT7LQvjJB AXd9uORWYSNsLBk1soB4rvrRVqQkHfsDW/DyvCovFFpSssuk1y0r/VN0O8gmXA== 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 4ZYPPd6kS9z17d6; Thu, 10 Apr 2025 15:49:09 +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 53AFn9sC051690; Thu, 10 Apr 2025 15:49:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53AFn9kK051687; Thu, 10 Apr 2025 15:49:09 GMT (envelope-from git) Date: Thu, 10 Apr 2025 15:49:09 GMT Message-Id: <202504101549.53AFn9kK051687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 726d4e14869e - main - release: Let basic VM images be built with NO_ROOT 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 726d4e14869ea4728b6ef2a3e4d6c43481416248 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=726d4e14869ea4728b6ef2a3e4d6c43481416248 commit 726d4e14869ea4728b6ef2a3e4d6c43481416248 Author: Mark Johnston AuthorDate: 2025-04-10 15:47:29 +0000 Commit: Mark Johnston CommitDate: 2025-04-10 15:47:29 +0000 release: Let basic VM images be built with NO_ROOT Reviewed by: brooks, emaste Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49738 --- release/Makefile.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 3b0ae4227453..b5ec044fa94a 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -1,6 +1,4 @@ # -# -# # Makefile for building virtual machine and cloud provider disk images. # @@ -107,11 +105,12 @@ QEMUTGT=emulator-portinstall .endif QEMUTGT?= -.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) .if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) || \ (!defined(WITHOUT_QEMU) && defined(NO_ROOT)) .error WITHOUT_QEMU requires NO_ROOT (and vice versa) .endif + +.if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} . if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF) ${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf @@ -181,6 +180,7 @@ vm-image: ${QEMUTGT} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ ${WITHOUT_QEMU:DWITHOUT_QEMU=true} \ + ${NO_ROOT:DNO_ROOT=true} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \