From nobody Fri Feb 6 07:50:56 2026 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 4f6mVY3VFzz6Qm7y for ; Fri, 06 Feb 2026 07:51:01 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6mVS2DHcz3mDC for ; Fri, 06 Feb 2026 07:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770364256; 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=uu/KsVWHVj2tuBL2xXB4MZN9lAqZnhcSKlQYLtoD+dc=; b=lLwljlYUXvwvU/7hYlc6vOEDE1CN+aZY2O5SJcTsot/WiKSEKcWFbtIXZOhMVuRBH5wERQ +pp23STOpgzo4W+xA7eoy4lVQLyWKfmbeIDVe/GyZS15xeCDnkeHpR4+DZViA7lRV+rKGT rlpNw7v+ggQLJuROPr8DPmr4yx9oB8xd08TC0p3WblXBfaW7GVLThJSp3dIS7yry7ic5gG H0fH/EwHwVe7apj+rhEYtrbKB6zJabRaiXoYGqw7zrWDK42c/3m4USQU9cQVkubKMZaAsE PlBmyHMqnBbLrfDk2vy2ZQZLL1yiuA+vclD8cO4G1N5Zk3QOXKUlO5EFTcqugw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770364256; a=rsa-sha256; cv=none; b=oxYNJLWirIwNhoA5GyP39097iOLqPIgKiq2qy7/ZP1v/eID67/nuH+WXjg4dRZILvAQ5fu xDbF+kzMwtLSmd3laWJTp+pwE/xdM4ygpL8LY6MMFZAMF9VNIfqP2zix2IRuOlZv6oBan4 Zm4eQFIenYGF+5TEe4ycFeBDupv71nLHW/tyrR/TLilYF8ioKngfpVAocZKTikBx3+X4Bt dJhg0tO/eldK93TGj+SR582noVbLEyojC2tpLilfMpE0uaQc9szxRXNpZM8L9x3fBA3s3v Us2dlYNQuXEcpoXfuWGMYZV12VMlWL0YYI6hIEAQXqgYDVLiHouQuG6qbTL7WQ== 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=1770364256; 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=uu/KsVWHVj2tuBL2xXB4MZN9lAqZnhcSKlQYLtoD+dc=; b=b7PudpymiSoQLlkyYgXVpWxt1T97t+ZUyU0aS19y7+aLkuZD/F551hvlwPqSuFkaLlb3gD pYUdAIgkRCtRQdtB/Yvsku5P56RX0O8+BveKa/ibxC+ivxHbGBHGCV0QCMduHYN67+P0Ir 48tb1mjjcEOAS6WfcHR8ywnNK4+4aO4k5xmL2+wu5aKpZWV74u7u06WIPeTkgEmyF1/Xtv PpIzvDN3YzsdHVcP1p2HpkCHNpZ9aVDvTE8KjEPpzu4tsYO4YGsm407PGubUGD/B38JQTl fqn/moQNGqAM4DMoC7uv/qqxdbx7Q4UAhuJleW2ynE1mSBFeJozfnSZYuoz2TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6mVS1h10z15cS for ; Fri, 06 Feb 2026 07:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 392f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 07:50:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Pat Maddox From: Kyle Evans Subject: git: 93f482ab3e6b - main - release: Pass optional VM_IMAGE_CONFIG to vm-image 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93f482ab3e6b4577f13e85e216a50bdf3704dda3 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 07:50:56 +0000 Message-Id: <69859d60.392f7.691b29e1@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=93f482ab3e6b4577f13e85e216a50bdf3704dda3 commit 93f482ab3e6b4577f13e85e216a50bdf3704dda3 Author: Pat Maddox AuthorDate: 2026-02-06 07:50:20 +0000 Commit: Kyle Evans CommitDate: 2026-02-06 07:50:20 +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 Closes: https://github.com/freebsd/freebsd-src/pull/1993 --- 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