diff options
| author | Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2021-01-06 17:08:52 +0000 |
|---|---|---|
| committer | Alex Richardson <arichardson@FreeBSD.org> | 2021-01-07 09:26:21 +0000 |
| commit | 0cace0bb0ae0158d8a770a88570fa93d47ffc980 (patch) | |
| tree | 86f70f4b1f5ef6da496f8e5ac922aea5c2888d76 /Makefile.inc1 | |
| parent | fe41c64b577251fd1df89aa6c722a877b88b402b (diff) | |
| download | src-0cace0bb0ae0158d8a770a88570fa93d47ffc980.tar.gz src-0cace0bb0ae0158d8a770a88570fa93d47ffc980.zip | |
Add mkimg to the list of bootstrap tools
Having this as part of the bootstrap tools is useful to build disk images
to boot in QEMU (especially when building on a Linux/macOS host where
mkimg is not available). We have been bootstrapping mkimg in CheriBSD for
a long time (using LOCAL_XTOOL_DIRS) but I believe this is also useful
upstream.
Reviewed By: emaste, brooks
Differential Revision: https://reviews.freebsd.org/D27602
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 1bf174419da0..4527c22208c5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2287,6 +2287,14 @@ _bootstrap_tools_links+=kbdcontrol .endif .endif +# 1300102: VHDX support +.if ${BOOTSTRAPPING} < 1201520 || \ + (${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300102) +_mkimg= usr.bin/mkimg +.else +_bootstrap_tools_links+=mkimg +.endif + _yacc= usr.bin/yacc .if ${MK_BSNMP} != "no" @@ -2462,6 +2470,7 @@ bootstrap-tools: ${_bt}-links .PHONY ${_flua} \ ${_crunchide} \ ${_crunchgen} \ + ${_mkimg} \ ${_nmtree} \ ${_vtfontcvt} \ ${_localedef} \ |