From nobody Wed Sep 11 05:29:31 2024 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 4X3Tf3708cz5WD7N; Wed, 11 Sep 2024 05:29:31 +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 4X3Tf35tnTz4mSD; Wed, 11 Sep 2024 05:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726032571; 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=jRVEFMzj1uSIJ9oGEC6Mxv5w5znMSb+zqxgVGQg3zLI=; b=sa4HGnmjd8YbkX1ACVSWPzCHMSGwnS+9DLEXGAZq38Bqjy9E+PnIquTFIzjomKGAs1TERg q3U0cofMFI/HR+nH6wcBcNI36Xvq39NJrGbP4oev0jUtesnUPDkAAIHkLjv9Zutg+AKjTR qN1FwdfXIkaWRq3YYJG0GHBe/JVkgZVGVZwl14AhELTKyoMSIPlnendYnx1eqj8tLo/Jee gw6Bm8qrAckuGSYO1w93nXHi8wezlED1XfOoogoambGs9Hu5BSyeZBOS1gahXz4dmtd+ew RSroDUw6ZDg53vvwF2AWthgWhNm9HzxWCUjB7kF+o5+q9TX4IJUClaMcEHKNdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726032571; a=rsa-sha256; cv=none; b=h5P9VSeU/ybVOUegWNbH2Nz2Fm5YGygP0dlgUaRbk9FVXXJZq9jEoYIBirIX1NDl83p0om kHi6H+wnLC6+VmxLGQ+fevM2FS1xkYDnrW7Nh7XNM/CF5/e5Es/WFy2lLWWwo7oihgJTtU L3tevof1Np/K+dF0JjysWITUoY0fO1PGzare66twRD+Xd7bLFP1PoWCl/6BNawkQ/maLcF 6yRdQvT7c/sC/v8fCrslaFoyLkirqfH6iQ7TEa3SrAI0Qmf3f2X2VMEbOYk0h70bVyaX/w V7kQ7ELOyqEkGQgjH/6yRer0hv3Pkr1gZYgyixFxZuiEHqJpt34kc6kIKfiJEA== 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=1726032571; 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=jRVEFMzj1uSIJ9oGEC6Mxv5w5znMSb+zqxgVGQg3zLI=; b=WkUNp+9GIS2WJAtTW5TUb8iPkMCKmbr9Ki4NVoL6AH7qlPctw38Qb2kzPi9Ddj8FQnwY5B sVIUkjGXYMJX52vc7MgW4rjtB/Nz3Bmwy62CeJBIaGbd8wHO+p+04N/FRqRM0LJvShP6Xr 1VlkryUSFlJ0NNtzYd5Fr4hh8Ghtq2sVL+76RhyDooEs5qiWRx4AvGkH1bHBHBGr1yhU5K t9n9RvL+OWF3eQxCUIKSoXokkITy+UL4r4zzEXL32Mtrs0PSzLoMqH/njSRZ/AOOUdt8gg XF2yuUzwb4CKRZwYQXdfbsWuAattNd6e1Yzp8+ubsfP5lzW30vMIcLQHowqmsQ== 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 4X3Tf35TzWzHpx; Wed, 11 Sep 2024 05:29:31 +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 48B5TV2Y065086; Wed, 11 Sep 2024 05:29:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B5TVjo065083; Wed, 11 Sep 2024 05:29:31 GMT (envelope-from git) Date: Wed, 11 Sep 2024 05:29:31 GMT Message-Id: <202409110529.48B5TVjo065083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c8d5eda2d4ee - stable/14 - vmimage.subr: Pass $INSTALLOPTS to install* 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8d5eda2d4eec339ce880e28d4c4590a35ede2e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d5eda2d4eec339ce880e28d4c4590a35ede2e1 commit c8d5eda2d4eec339ce880e28d4c4590a35ede2e1 Author: Colin Percival AuthorDate: 2024-08-31 23:38:02 +0000 Commit: Colin Percival CommitDate: 2024-09-11 05:28:59 +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 (cherry picked from commit 81d3df02bcf5ed6e41a91fd9fbc3b81cfe809ff3) --- 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 72540dad14a8..c95a6dc82937 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}."