From nobody Thu Mar 27 23:51:47 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 4ZP0n00VbYz5s5yC; Thu, 27 Mar 2025 23:51:48 +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 4ZP0mz3PX3z3C7M; Thu, 27 Mar 2025 23:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743119507; 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=kYZSIurIEgcWC91WD1RRzr2oeFoGKC3QWtk/PewGYJI=; b=tTDz5oV5CcVTly6nx0oB/i4iDwLi7Wv3tOZdvvghUy6HgMDNjSBIfyhdjOmJpZqW3K9GGw FQawMsmnIrz2Sx3EjonxZNaJp5N//hZh6QX3f+mWPkOFBI5onNN/mREJutQaGRociD3l/4 fmuXhM1YkBkgo97io2gVT/Jlgt7qmMBmdNxCFQsnxrIWMtJkGIDDRvLvQa5PzpHxznmp2f xUI6TDkrhPELKSA8QMAe4GqlTYTGCx75f08Is+XNblrUgtfHrBet5Hv46LXtLeykRUzdXk QqhmSsrmF+amnaqom9CwLVsXI8y1TXndvEjf1jd+5qw8+a8M2omBlWFmCO6/AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743119507; a=rsa-sha256; cv=none; b=uCSNrCSV7EV8qre4aHZJDMIxFZ49CbUQ8/keN75zDg44su0vZlTqon9AjwzEsL14zVqfj7 3QfHrSRPqKL47IjkGoMcOfIDyBy4aUMyj6fRPljQ0EnISKLcBCh2xzm9EVbqhOxknzjzTt CpHdHC/s9pWaf/ggbuVnGwrU1xAGs4Y/nBosATl33jnk61EFluMBksdpRdyL7gU1408Ygk PBlqFfPcgbsGBaGnrfyeEw+Q9ZaLRo2hU9gwh6RKAsaKsH8+Boxs9ipA9xSU7ngWUFPG8e tXmVFGmPS8NqMd970e/nFsygTHJKBrwLg/cWjbCwopeqXBnL6QgsOtCpokYMKA== 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=1743119507; 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=kYZSIurIEgcWC91WD1RRzr2oeFoGKC3QWtk/PewGYJI=; b=pY7Ov0R6sf7QfPzryq8uJIxKih8m5iSpnrKNDScu2jiugxyeKQGwTeBkxhXEuSbEmDHrpO UevpE1q9/ktJbWSgVyK1qgM9EnwPQ8yLV7R7FJDdX4uRaiSosSKwx7PrtBGl3JS0JV168K v9LvxoYbYK1F9dZMmlmcN0CNNM1vAgMKs1DUuEu7OUT/Ftx/hSkLDvNa/ZeGw9l9RQlBlx A7yr/U6ctW93fp5Y2MRzFMHM8AqVvOuKkCmn3ki0UCpZEejx91K8nXdE559Xz+T8bjxg/V G0VXeXrbOoypYw4KI83REcaofUSpB5Rwwj1sGAbtt1xb2/Yz5ZgYzj9ZRsBhqg== 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 4ZP0mz30byz25q; Thu, 27 Mar 2025 23:51:47 +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 52RNplD9060893; Thu, 27 Mar 2025 23:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52RNplWE060890; Thu, 27 Mar 2025 23:51:47 GMT (envelope-from git) Date: Thu, 27 Mar 2025 23:51:47 GMT Message-Id: <202503272351.52RNplWE060890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e6e5cd297ab4 - main - release/vm: fix setting NO_ROOT and WITHOUT_QEMU 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6e5cd297ab4cae4995895b99c713df9cf6e8c0f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e6e5cd297ab4cae4995895b99c713df9cf6e8c0f commit e6e5cd297ab4cae4995895b99c713df9cf6e8c0f Author: Brooks Davis AuthorDate: 2025-03-27 23:40:47 +0000 Commit: Brooks Davis CommitDate: 2025-03-27 23:51:39 +0000 release/vm: fix setting NO_ROOT and WITHOUT_QEMU To support common shell patterns (test -n and -z) we want NO_ROOT and WITHOUT_QEMU to be set and not empty in mk-vmimage.sh if they are set at all in the Makefile. Actually do this rather than making them always set (which propogates to submakes run by mk-vmimage.sh and unconditionally enables NO_ROOT with undesirable side effects such as installing a /METALOG in vm images). Reported by: cperciva Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D49544 --- release/Makefile.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 1f56bdb03f97..f58c7c7fd092 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -129,8 +129,8 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ - WITHOUT_QEMU=${WITHOUT_QEMU:Dtrue} \ - NO_ROOT=${NO_ROOT:Dtrue} \ + ${WITHOUT_QEMU:DWITHOUT_QEMU=true} \ + ${NO_ROOT:DNO_ROOT=true} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${_FS} \ -i ${.OBJDIR}/${_CW:tl}.${_FS}.${_FMT}.img -s ${VMSIZE} -f ${_FMT} \