diff options
author | Jessica Clarke <jrtc27@FreeBSD.org> | 2023-03-15 00:06:53 +0000 |
---|---|---|
committer | Jessica Clarke <jrtc27@FreeBSD.org> | 2023-03-15 00:06:53 +0000 |
commit | 9e914c7af1f3d176acf2712e5a86a9a6a7b779c6 (patch) | |
tree | c55e5c0f6b45c3e957ff2b0822d639f09327b1f4 /Makefile.inc1 | |
parent | 379954d06c1d55276acb606a04f804924b94494a (diff) | |
download | src-9e914c7af1f3d176acf2712e5a86a9a6a7b779c6.tar.gz src-9e914c7af1f3d176acf2712e5a86a9a6a7b779c6.zip |
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
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 22 |
1 files changed, 20 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} \ |