From nobody Wed Sep 04 05:57:16 2024 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 4WzBbK1Kpbz5V9tx; Wed, 04 Sep 2024 05:57:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzBbK0J6nz43Wl; Wed, 4 Sep 2024 05:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725429437; 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=Vt0Q3/k+6fxERkkq6n5oFx9+2M14oQf52REWFY5lyCE=; b=oarZBOiVI+RSIx8MqO5AT9tcTnlP4+yctJJnl7BtUFB7rguXTQpOu1t3J/+2dOHiEe0ipL Xd2RJWgxWeISv47mnofXGXoBswQPtfcS8CLUSIjO0plye+Ge+F1ZoCOlHWbnXDexQ+ECVu tfgQ2QrdN5uaX69LeQQQLfCqfBfPF8PcRLhWlMaUsUo72qIzh422TJ2/il9zmvOf9ImVtv JG0h246RnRpZNAx1Jc1cJhPJr4xGMzG4oUKQEdgbjIvE7aNx3cp/osq+U0OpH+VqfQp6a4 D/88ewIa6F1uSXmL9+3lPeOyHCVyLerUrQE/qalC1WBUPzHqGFOTcXIv+X6VMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725429437; a=rsa-sha256; cv=none; b=SJU8BMaVCvSp2Ahvb80hS4KZXAfPZjRownXf3m8bEr7ewGnF3G3JvfkeGa4vKdnTJtLoM5 FZFgE+unWldWUUGGUWYo4Rw4aLSFU/qwzy3Cx05fSDJVkV+tVDKwejBeLKKkub3IJcnF93 kOmFtATqJqNscIf7I4MNqSnhGkYk9qWmNDjEHOGsGFQoTNozkI9IwJ8nH4vIuUD+DlWI70 OLFDH4EnFBJ/EAGVjU0ivEVujrLRa2HmTG14cWQbP0ZTco54Py226CKVqRuO5OWEnVYSou m5SJ4a50pVVTmvviTwON1URUuk0aCUECsBkcOPt/Ydtld7lpx9yjO2KiHkCEEw== 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=1725429437; 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=Vt0Q3/k+6fxERkkq6n5oFx9+2M14oQf52REWFY5lyCE=; b=GPF6B2v/8yJBdysb4LyHUYzJRm4nbKKmZSvvvIy8kUPCikcRlaAlc+ZXLIiS3liwoGzG11 VLYG59ikRVn1lrXabLZCW8PiUdTXJ7ncLrFqykcQ/+IK7zqWRyz/inuC5QZAA37Ro7nG1y Gwc2+RyBh6seMph715pg2+yJGk6jRTqroHllMUhn9+NViMUOe+0ESit5FDEP7kXSSHlRpw rlgRhc6MipMs1BEvfZqDXlL5wd24UXqqE8PYr+EO9raMr5vx568TMIpNo7AqKnQ1SXt/xf wLWrzUmv5HT5sLfmW14FgHIlJPLKHFKPEvUibsp6wGGumbSyx+C3T2yDIVvvcw== 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 4WzBbJ6vX8z1C8J; Wed, 4 Sep 2024 05:57:16 +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 4845vGKV099275; Wed, 4 Sep 2024 05:57:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4845vGvZ099272; Wed, 4 Sep 2024 05:57:16 GMT (envelope-from git) Date: Wed, 4 Sep 2024 05:57:16 GMT Message-Id: <202409040557.4845vGvZ099272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 81d3df02bcf5 - main - vmimage.subr: Pass $INSTALLOPTS to install* 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81d3df02bcf5ed6e41a91fd9fbc3b81cfe809ff3 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=81d3df02bcf5ed6e41a91fd9fbc3b81cfe809ff3 commit 81d3df02bcf5ed6e41a91fd9fbc3b81cfe809ff3 Author: Colin Percival AuthorDate: 2024-08-31 23:38:02 +0000 Commit: Colin Percival CommitDate: 2024-09-04 05:57:06 +0000 vmimage.subr: Pass $INSTALLOPTS to install* This makes it possible for a VM build configuration file to pass options to make installworld/installkernel/distribution, e.g. WITHOUT_DEBUG_FILES=YES in order to produce smaller images. Note that these options are only applied at install time, not at build time (since the same build is installed into many different VM images), so not all src.conf options are usable here. Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D46506 --- release/tools/vmimage.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 9a60be57acf3..5d98b8990705 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -52,7 +52,7 @@ vm_install_base() { # Installs the FreeBSD userland/kernel to the virtual machine disk. cd ${WORLDDIR} && \ - make DESTDIR=${DESTDIR} \ + make DESTDIR=${DESTDIR} ${INSTALLOPTS} \ installworld installkernel distribution || \ err "\n\nCannot install the base system to ${DESTDIR}."