From nobody Sun Apr 12 13:44:26 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 4ftsGM2nFfz6ZM8J for ; Sun, 12 Apr 2026 13:44:27 +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 4ftsGL2M1Qz3krB for ; Sun, 12 Apr 2026 13:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001466; 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=C2PfWW2VLWfDBHwwtFliLzbe5k6K6+RyJpMSZwpgaqA=; b=JtF7Tk2spdh7yiNjMpM0HHCXWtD1q4SLVABluMKxSdn6z5S/OJpVfjIqfXLSRVMbsbmzMs DMds2hfbXA270Kz3CQROCYhuZWUkTB2Y1SaUS5d1rhev259+JlXvEb/4nFIwGsQOntxBS9 kyyJ3/XDVKgsgTmbPtppM0B+ZdF+vJ2j2ciYP+NCjWzZYVFxUnxsf+WG1NdMYawvaMeBPB AeFxmW7So8Fg9upi3CvuuOnKsBkr8UOJEL4AJ3zSYAApAUzL6t78nNuaelhKzbkikGhHN/ flTNCipjzT5hrWhsnvEgwK0/fFN+8an//Odm4Cgf4J9zWrigv2zmc5ECq0F3eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001466; a=rsa-sha256; cv=none; b=bWxTJY4j3eDYq24H1Yx15EBTXp3PF7lECNA0fN7uS9sL7ONxGbbTiEjC6NYfzoMcZIN3vD VOZAzUlOGALaagCRqpxYhJe7654AzAZVRhnGz2N8PesIWdx7gnA0WfAa4DoLxM8Y1BBH4v Ss/fvrt93BHLtltumfj30TaHziX2MbG4t1TGeTEa50M/6mJm1KK4YwB1TGT922OK+5tLr9 CO7VQh0dJlQjod+kA8TPzZ9DABZv4X1HS7tKkyO8d8MxnBg1CN7tuewXz/+HH3prkU7iXn iVgCmPv4naQvrCnJc4foNGKu9cLMw5lHyh5x//sHWIgmmgR4mdMfLID2cAeyeg== 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=1776001466; 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=C2PfWW2VLWfDBHwwtFliLzbe5k6K6+RyJpMSZwpgaqA=; b=guVsnWMEoER+XNDnLT2LQ0GCpe+4+bRsQI3wv7UXiCeVUWyLSCwbKXyTo6Y7lIhDCybaRv d0MX9y8C2JVTPGQEo7tf+le7SMN1MLc5PTlv/ORM2INQQfYejxBW6pVARpSE7Klnc0L11b osIlcj84nUzBiokBCBeEQWEZRAbB9BxfS1FUhWEzLKAYucaaAMRdVPqE+zNXZICDKPE7iT JIbcey4VsjJeGzOsVPx0IxveVuQ3utyCHlvEB97B25pWZfG3SetgDUsG8QOeAnRcdmG0vK dHy8M6zMDqb/S+TRdyzPZd0N6ozvqa0rJoFg6D74q5engoeuZ4wD8xhnAsTzhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGL1l3Fz4d9 for ; Sun, 12 Apr 2026 13:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c22 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:26 +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: b71d5748b741 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: b71d5748b741380cc99e31cffdb5584a3fbc1122 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:26 +0000 Message-Id: <69dba1ba.42c22.761a8fee@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b71d5748b741380cc99e31cffdb5584a3fbc1122 commit b71d5748b741380cc99e31cffdb5584a3fbc1122 Author: Pat Maddox AuthorDate: 2026-02-06 07:50:20 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:44 +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 6756d99bc288..e0e69deaaf28 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -178,6 +178,7 @@ vm-image: ${QEMUTGT} PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \ ${.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}