From nobody Wed Mar 15 00:07:15 2023 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 4PbrLD2JMwz3xgPf; Wed, 15 Mar 2023 00:07:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PbrLD1VrJz49hH; Wed, 15 Mar 2023 00:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678838836; 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=g7UyiTJvoYCZ9fYLHodG6+wS/6I6bU5gLwRc21yOnPw=; b=vXmLq/Qv+gJ/Q1XXTxKW1umQ3Iyhta9lzqeuIjahoXyhJHe+hn1s2f1PA3KJqPqsyOspuX chHyfPq8H3O0qvxV3uSlKXEI0MuYHki+hPLVfTvWbgyYQ6p7vxcK45D1JLuOPEu++fh7fm jsJ5qyXpIQf9Ts5X7zHc8uEZQtPTT2Cvwu+1tDQl3LHnDwtJBDI9o0WkVyXqgCAKHPVZNh xluynbzIxmYqZbdV0LrAS/SbLGWVfUh8YvpLj8Rcv5LwenZJY1fPdQptB9Vm4QneYnpysh Pgmgxc9ZXIPGi+iqSLbAIQmckOJmohG+BzVvcZQ4LcfLV7ks/i3SsdkGAAGF4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678838836; 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=g7UyiTJvoYCZ9fYLHodG6+wS/6I6bU5gLwRc21yOnPw=; b=isgVDm3A5EZz6nG9ZHpUouBQqzE2d4dZoPqc0Ub5DzMzLiu5AB1y0um1YtYBWpLd0GQiOq ww2fvY1S7jUHEs0g2kNzp53lgXsGbgtMdAxOamDYv22NqH60XSY4607vshkeTOxwSyt8Yz ZSgxD4pBMinei0eYVqUnawUhSZ2faAQHT+79mByvOtaat3c/ddS8IFtxrXS7YmFenk06bt acAx8kuT39awgVH8Fh1G4hgMAf8qRTn0AsbVIH0i+fcutbiz8KtPV0a2FyhM+GTj6Rwg3r wedR0Dj+lKbk98r7Mls5fc3ywnJjjR8Bo0yavSEYVPOswMClufG0J8/S5VROsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678838836; a=rsa-sha256; cv=none; b=qCSwVSQmS89mnbEDg36C9A3pjw96XceY7FfmbtvM7TC1WHUeOkppayPtEYOO0KRHju4toh a0+7/Tbpdyx292CfwpZMBoLCgCwpfF1zBNwYqFa3iejMfUUwSuptyPqel8dRlHzmuJl5db 7AjqzYYRMllweoFnQRfwP3LfanVhALde4ODDdzXv9+H+bXSvFokQvFp3dlgLzfTyi405yP kvr76xWPZ0nANezurT5zsGTANi3Kmx9c2MGLn3OhB+Qo2dfg4OY8KuSllBpNz82XYcymQg ow9UOiVSRqIpwt5bFLJlMTZWeZWH1X1/tGCg6/Yh+vGbhX0JsXaHLdGYeOuARQ== 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 4PbrLD0LRQzvbK; Wed, 15 Mar 2023 00:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32F07Fse014570; Wed, 15 Mar 2023 00:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32F07Fbt014569; Wed, 15 Mar 2023 00:07:15 GMT (envelope-from git) Date: Wed, 15 Mar 2023 00:07:15 GMT Message-Id: <202303150007.32F07Fbt014569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 9e914c7af1f3 - main - Add new DISK_IMAGE_TOOLS_BOOTSTRAP option 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e914c7af1f3d176acf2712e5a86a9a6a7b779c6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9e914c7af1f3d176acf2712e5a86a9a6a7b779c6 commit 9e914c7af1f3d176acf2712e5a86a9a6a7b779c6 Author: Jessica Clarke AuthorDate: 2023-03-15 00:06:53 +0000 Commit: Jessica Clarke CommitDate: 2023-03-15 00:06:53 +0000 Add new DISK_IMAGE_TOOLS_BOOTSTRAP option This will build etdump, makefs and mkimg as bootstrap tools to allow easily creating disk images. Note that etdump is bootstrapped due to its use in the release scripts for building ISO images. Reviewed by: emaste, arichardson Differential Revision: https://reviews.freebsd.org/D39072 --- Makefile.inc1 | 22 ++++++++++++++++++++-- share/man/man5/src.conf.5 | 7 +++++++ share/mk/src.opts.mk | 1 + .../build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP | 6 ++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2767a6038354..63c3ce80f54d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2301,8 +2301,8 @@ _flua= lib/liblua lib/libucl libexec/flua # r245440 mtree -N support added # r313404 requires sha384.h for libnetbsd, added to libmd in r292782 .if ${BOOTSTRAPPING} < 1100093 +_libnetbsd= lib/libnetbsd _nmtree= lib/libmd \ - lib/libnetbsd \ usr.sbin/nmtree ${_bt}-lib/libnetbsd: ${_bt}-lib/libmd @@ -2335,9 +2335,23 @@ _crunchgen= usr.sbin/crunch/crunchgen _bootstrap_tools_links+=crunchgen .endif +.if ${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no" +_etdump= usr.bin/etdump +_makefs= usr.sbin/makefs + +_libnetbsd= lib/libnetbsd +${_bt}-usr.sbin/makefs: ${_bt}-lib/libnetbsd + +.if defined(BOOTSTRAP_ALL_TOOLS) +_libsbuf= lib/libsbuf +${_bt}-usr.sbin/makefs: ${_bt}-lib/libsbuf +.endif +.endif + # 1300102: VHDX support .if ${BOOTSTRAPPING} < 1201520 || \ - (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102) + (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102) || \ + ${MK_DISK_IMAGE_TOOLS_BOOTSTRAP} != "no" _mkimg= usr.bin/mkimg .else _bootstrap_tools_links+=mkimg @@ -2538,6 +2552,10 @@ bootstrap-tools: ${_bt}-links .PHONY ${_flua} \ ${_crunchide} \ ${_crunchgen} \ + ${_etdump} \ + ${_libnetbsd} \ + ${_libsbuf} \ + ${_makefs} \ ${_mkimg} \ ${_nmtree} \ ${_vtfontcvt} \ diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 04af879dbd02..7ef13efbb4d0 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -569,6 +569,13 @@ This must be set in the environment, make command line, or .Pa /etc/src-env.conf , not .Pa /etc/src.conf . +.It Va WITH_DISK_IMAGE_TOOLS_BOOTSTRAP +Build +.Xr etdump 1 , +.Xr makefs 8 +and +.Xr mkimg 1 +as bootstrap tools. .It Va WITHOUT_DMAGENT Do not build dma Mail Transport Agent. .It Va WITHOUT_DOCCOMPRESS diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 7e865b31db25..880f1139843c 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -197,6 +197,7 @@ __DEFAULT_NO_OPTIONS = \ CLANG_EXTRAS \ CLANG_FORMAT \ DETECT_TZ_CHANGES \ + DISK_IMAGE_TOOLS_BOOTSTRAP \ DTRACE_TESTS \ EXPERIMENTAL \ HESIOD \ diff --git a/tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP b/tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP new file mode 100644 index 000000000000..5f5fba2ea0a2 --- /dev/null +++ b/tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP @@ -0,0 +1,6 @@ +Build +.Xr etdump 1 , +.Xr makefs 8 +and +.Xr mkimg 1 +as bootstrap tools.