From nobody Mon Apr 07 01:26:22 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 4ZWBPW0FGbz5sNHk; Mon, 07 Apr 2025 01:26:23 +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 4ZWBPV4XKqz3vwB; Mon, 07 Apr 2025 01:26:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743989182; 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=mRLvnAnD40jH3BtfeRXing9q9WfYEgQc0/vLFKd8Fto=; b=YjpcWNwui8PFcGY1vM8z59RlrDuNZrEJkfSEBWhVpRwIpDCE/L/TczZ/aklQSmiZHZVVuT 6PdQyJ0+NeUsPhjy/wc8SgMP+1wSwY0zGfY/uZWH/s0y8gsDc3UyXiRAtLpj1CPli1f9WB GJaBbiFFg7a1oWbOLE2uU+F9XhgyKAqqOB4I5r5yxri047abzYXL830IpMP5KKOfqKoF/U 54hGG1lcFZfNfDN7YdyEBZR1HF7IOBpOwpUkb0/BCWe09m9i1B1EhFZIuCDKtsyIEEqoP+ 21OBreHqCzxBAIiCNLIujNppZjhsyEwDtFenu80AHHW4lwBYvH3X01aRadaRFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743989182; a=rsa-sha256; cv=none; b=iuPJB4ocRk4m9SpdRMzQ82nyAnCITNx5Xy6PhrdqINIKQpVXI7FChaQTRnEHJo2pDu1b+G 9i1fv+I3C7Sa3Rb6IDyhHcd2Jm8EWLIyvdIabQveqpAh726SEAzqDfHA5OxwjEgAB/J82g rdLSly/+DMstC+++ZUdc4CAX92U/jvsEDWll0xocvGXV4i0Jca+gZFTgQWgdRWQ3ROLFDu hRQKhXs6A78Qfulp8rj3cknKtvHUIKptxKL7V2dFVUeAOaq4yITCXdT+jsF2LKnHFo2SiK 9axk4C7Az2F6oVHe3tb/lLR6oYirGpOGQlII12fdvWA68DdYTHq5qe1z9C3UHA== 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=1743989182; 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=mRLvnAnD40jH3BtfeRXing9q9WfYEgQc0/vLFKd8Fto=; b=Z5KxR2VEFe/5tkni+xD8yIldcl+Hgz2n93A3KzHRvn5dM8qftAjPiQ9GY+w2d0JlOAmt6c 4ebWpiix+TgKnUJyH0wvoAOk+Z418zzN1Kt415jlOxIIu47Nzq3LAM7O+gZ/w6d+L00mvV xv5Mk101jEAzhOGb6vf1M6eclfAKhnFYTwE6Qj45Mjsg2PIiq5ZWkMxEI2SBWe0Km4Ds8v F7Ef7dhwo0GO0IFOZrMp8BplFllLyhiLuBQTtdtSRJ+MKZ8YMb+ymG9zW49KJ+J7dd0PAT CPBZFN8KCtLtHFCLfZHWFP26e1e1DDWQJVbtYOnlFxTXN+0i8cwB6hrn2i3VNQ== 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 4ZWBPV3qBFz9JQ; Mon, 07 Apr 2025 01:26:22 +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 5371QMqx061838; Mon, 7 Apr 2025 01:26:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5371QMZB061835; Mon, 7 Apr 2025 01:26:22 GMT (envelope-from git) Date: Mon, 7 Apr 2025 01:26:22 GMT Message-Id: <202504070126.5371QMZB061835@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: 75ae454d5814 - main - release/vm: finish fixing 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: 75ae454d58144d23672607a4a02b9b36532caf76 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=75ae454d58144d23672607a4a02b9b36532caf76 commit 75ae454d58144d23672607a4a02b9b36532caf76 Author: Brooks Davis AuthorDate: 2025-04-07 01:24:21 +0000 Commit: Brooks Davis CommitDate: 2025-04-07 01:25:57 +0000 release/vm: finish fixing WITHOUT_QEMU To support common shell patterns (test -n and -z) we want WITHOUT_QEMU to be set and not empty in mk-vmimage.sh if it is defined at all in the Makefile. Fix a case I missed previously. Reported by: cperciva Fixes: e6e5cd297ab4 ("release/vm: fix setting NO_ROOT and WITHOUT_QEMU") Sponsored by: DARPA, AFRL Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D49666 --- release/Makefile.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index f58c7c7fd092..3b0ae4227453 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -180,7 +180,7 @@ vm-image: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ - WITHOUT_QEMU=${WITHOUT_QEMU:Dtrue} \ + ${WITHOUT_QEMU:DWITHOUT_QEMU=true} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \