From nobody Sun Apr 12 03:16:37 2026 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 4ftbKx4Vx3z6YM79 for ; Sun, 12 Apr 2026 03:16:37 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKx3727z3NqF for ; Sun, 12 Apr 2026 03:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmfEgbAAQ7VMFnh6UPll1cPLBcfk4oRyGUNZAbtazmM=; b=Hu/i9NKCIMvsdTZEvDW1LectedNRebS8Sni0grqGvIXNRBSedcc1ALciooMT5/Vm6bz84x kCwqPhJeoxuyFgVq2legGwwgQS39DBqoi6AWsLs8JVxVGynrbHoYL5kRDTU7BFvZuCzNjw 06dwnT4oqvUaXDxftRwHVyCm9v6cMYVZfsKWfIGUY4SEPs4R+0PI0wiw9IoSCMaIb+6vd1 0CKaTdcY/UX7p4/vppLxM3uH1+Mm1O+xwW22XJamAfxqqeZnPeEa2hITLu7+ZHoOXR2NI/ d3rCKYtNsu9Od44A9PFKDkbk5zWD1E5el0wUJ54m8X2C/+jBnohYShiOUTDtkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963797; a=rsa-sha256; cv=none; b=G/UX+wzYdTuS0EgjubF70VrJdFUCDDPwoQ61+axkiCH8a5OGXu2W2tXqq8HYqg4RPAn0O4 gCrWnjoRMVfB830Ui/NNa75serANMYiH6W2cs1cUOzWRkUmk9R3/stmc9kPwVOXo8HZpkA i3Y1TmuUt+ExnPSnobTatIEFVbTgcsmUNpAQ4ade8kMG7KYC+9ZhqRKmI1vTHXq/M7Eaz8 NsKDhlc4jmCLzogMqJG4mrH5wJZzQtBx6yiStIn2IeXcolfGSnMH11OeR2cgsw14UGtFcb 1aZvaAEmV1JVNJ4fGwDI+6kbHuCnexWk2zhlYesyKCazTFU3yXGuhWGi0/7mFQ== 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=1775963797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QmfEgbAAQ7VMFnh6UPll1cPLBcfk4oRyGUNZAbtazmM=; b=MEuIaOp0anPfmwRQU2Sz/XiImzMgFWLwXVkXrFEYIMyhE0uFc3mFPfUvFqeLH5WntWMhm5 wWbgIXbNFLLxx5K+rvJxgjGxtdYySs1c5ZBSzCUSBfJwuI3WsdX01iST5YD7zscC2fwesD 6++/kQnSjiThLsn6lAAq6gPdiWGf1EOClGbOBO/aY4sht9Y9H4obMoL/9KPjK69/0Bal9v pow7FXbbKqdOo/UrOq/r35S8TcWU9bTbnXXcRaUFBplDmZFUjirXedO3OJd/CsatnXfZmv kYIxQrzFpPG4gDQ3p90RjASIalGzAoe6XNfMSA0UtfOGLh6KGWneS8c+gu9eag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKx1YSnz10CP for ; Sun, 12 Apr 2026 03:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 473a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Pat Maddox From: Kyle Evans Subject: git: a41c4d904b85 - stable/15 - release: Pass optional VM_IMAGE_CONFIG to vm-image 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a41c4d904b85ed805e3adf401c4fe5d261e457e2 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:37 +0000 Message-Id: <69db0e95.473a0.38bbb53@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a41c4d904b85ed805e3adf401c4fe5d261e457e2 commit a41c4d904b85ed805e3adf401c4fe5d261e457e2 Author: Pat Maddox AuthorDate: 2026-02-06 07:50:20 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:14 +0000 release: Pass optional VM_IMAGE_CONFIG to vm-image `make vm-image` calls mk-vmimage.sh, which supports `-c CONFFILE`. This file gets sourced before building the image. One example of how to use it is to define vm_extra_filter_base_packages() to filter the list of packages installed into the VM image: # vm-nodbg32.conf vm_extra_filter_base_packages() { grep -v -E '(-dbg|lib32)' } $ make VM_IMAGE_CONFIG=path/to/vm-nodbg32.conf \ VMFORMATS=raw \ -DWITH_VMIMAGES \ vm-image Signed-off-by: Pat Maddox Reviewed by: cperciva (cherry picked from commit 93f482ab3e6b4577f13e85e216a50bdf3704dda3) --- release/Makefile.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/release/Makefile.vm b/release/Makefile.vm index 3e5f4936b518..abbfcb341afc 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -211,6 +211,7 @@ vm-image: ${QEMUTGT} ${PKGBASE_REPO_DIR} PKGBASE_REPO_DIR=${.OBJDIR}/pkgbase-repo-dir \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ + ${VM_IMAGE_CONFIG:D-c ${VM_IMAGE_CONFIG}} \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} || true